diff --git a/testsuite/render-microfacet/ref/out-optix-alt2.exr b/testsuite/render-microfacet/ref/out-optix-alt2.exr
new file mode 100644
index 000000000..ea521bf3d
Binary files /dev/null and b/testsuite/render-microfacet/ref/out-optix-alt2.exr differ
diff --git a/testsuite/render-microfacet/run.py b/testsuite/render-microfacet/run.py
index 1dac3ca98..3ecef3c58 100755
--- a/testsuite/render-microfacet/run.py
+++ b/testsuite/render-microfacet/run.py
@@ -5,6 +5,7 @@
 # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
 
 failthresh = 0.02
+failrelative = 0.01
 failpercent = 1
 allowfailures = 5
 idiff_program = "idiff"
diff --git a/testsuite/render-mx-generalized-schlick/run.py b/testsuite/render-mx-generalized-schlick/run.py
index f6b9d2d40..e899d57f0 100755
--- a/testsuite/render-mx-generalized-schlick/run.py
+++ b/testsuite/render-mx-generalized-schlick/run.py
@@ -6,5 +6,8 @@
 
 failthresh = 0.01
 failpercent = 1
+allowfailures = 2
+idiff_program = "idiff"
+
 outputs = [ "out.exr" ]
 command = testrender("-v -r 320 240 -aa 16 scene.xml out.exr")
diff --git a/testsuite/render-raytypes/run.py b/testsuite/render-raytypes/run.py
index 0e0c6f8b2..281031db6 100755
--- a/testsuite/render-raytypes/run.py
+++ b/testsuite/render-raytypes/run.py
@@ -10,6 +10,8 @@
 failthresh = 0.01
 failpercent = 1
 hardfail = 0.025
+allowfailures = 2
+idiff_program = "idiff"
 
 outputs = [ "out.exr" ]
 command = testrender("-v -r 100 75 -aa 2 scene.xml out.exr")
diff --git a/testsuite/runtest.py b/testsuite/runtest.py
index c3c43d890..0496244da 100755
--- a/testsuite/runtest.py
+++ b/testsuite/runtest.py
@@ -454,7 +454,7 @@ def runtest (command, outputs, failureok=0, failthresh=0, failpercent=0, regress
                    failthresh=failthresh, failpercent=failpercent, filter_re=filter_re)
     
 if ret == 0 and cleanup_on_success :
-    for ext in image_extensions + [ ".txt", ".diff" ] :
+    for ext in image_extensions + [ ".txt", ".diff", ".oso" ] :
         files = glob.iglob (srcdir + '/*' + ext)
         baselineFiles = glob.iglob (srcdir + '/baseline/*' + ext) 
         for f in chain(files,baselineFiles) :