diff --git a/tests/pipeline/ray-tracing/raygen.slang b/tests/pipeline/ray-tracing/raygen.slang
index 1b13a63c28d..3edde6c1ab0 100644
--- a/tests/pipeline/ray-tracing/raygen.slang
+++ b/tests/pipeline/ray-tracing/raygen.slang
@@ -1,6 +1,6 @@
 // raygen.slang
 
-//TEST:COMPARE_COMPUTE_EX:-cuda -rt -output-using-type -compute-dispatch 4,1,1
+//TEST(optix):COMPARE_COMPUTE_EX:-cuda -rt -output-using-type -compute-dispatch 4,1,1
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0],stride=4):name gOutput,out
 
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index da03d67fe4e..8b3fda9dd4c 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -3105,6 +3105,7 @@ SlangResult innerMain(int argc, char** argv)
     auto vulkanTestCategory = categorySet.add("vulkan", fullTestCategory);
     auto unitTestCatagory = categorySet.add("unit-test", fullTestCategory);
     auto cudaTestCategory = categorySet.add("cuda", fullTestCategory);
+    auto optixTestCategory = categorySet.add("optix", cudaTestCategory);
 
     auto compatibilityIssueCategory = categorySet.add("compatibility-issue", fullTestCategory);
         
@@ -3206,6 +3207,12 @@ SlangResult innerMain(int argc, char** argv)
         options.includeCategories.Add(fullTestCategory, fullTestCategory);
     }
 
+    // Don't include OptiX tests unless the client has explicit opted into them.
+    if( !options.includeCategories.ContainsKey(optixTestCategory) )
+    {
+        options.excludeCategories.Add(optixTestCategory, optixTestCategory);
+    }
+
     // Exclude rendering tests when building under AppVeyor.
     //
     // TODO: this is very ad hoc, and we should do something cleaner.