diff --git a/tests/python/storm_render_tests.py b/tests/python/storm_render_tests.py
index af17d3d9397..87facf20897 100644
--- a/tests/python/storm_render_tests.py
+++ b/tests/python/storm_render_tests.py
@@ -59,6 +59,24 @@ BLOCKLIST_METAL = [
     "autosmooth_custom_normals.blend",
 ]
 
+# AMD seems to have similar limitations as Metal for transparency.
+BLOCKLIST_AMD = BLOCKLIST_METAL + [
+    "musgrave_.*_multifractal.*.blend",
+    "noise_lacunarity.blend",
+]
+
+# Minor difference in texture coordinate for white noise hash.
+BLOCKLIST_INTEL = [
+    "autosmooth_custom_normals.blend",
+    "hair_reflection.blend",
+    "hair_transmission.blend",
+    "principled_bsdf_emission.blend",
+    "principled_bsdf_sheen.blend",
+    "musgrave_.*_multifractal.*.blend",
+    "noise_lacunarity.blend",
+    "sss_hair.blend",
+    "white_noise.*.blend",
+]
 
 
 def setup():
@@ -121,7 +139,16 @@ def main():
 
     from modules import render_report
 
-    blocklist = BLOCKLIST_METAL if sys.platform == "darwin" else []
+    if sys.platform == "darwin":
+        blocklist = BLOCKLIST_METAL
+    else:
+        gpu_vendor = render_report.get_gpu_device_vendor(args.blender)
+        if gpu_vendor == "AMD":
+            blocklist = BLOCKLIST_AMD
+        elif gpu_vendor == "INTEL":
+            blocklist = BLOCKLIST_INTEL
+        else:
+            blocklist = []
 
     if args.export_method == 'HYDRA':
         report = render_report.Report("Storm Hydra", args.outdir, args.oiiotool, blocklist=blocklist + BLOCKLIST_HYDRA)