diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_selected.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_selected.png
new file mode 100644
index 0000000000..bc65a767e4
Binary files /dev/null and b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_selected.png differ
diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_unselected.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_unselected.png
new file mode 100644
index 0000000000..e75ca48135
Binary files /dev/null and b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/basisCurveInstance_unselected.png differ
diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_default.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_default.png
new file mode 100644
index 0000000000..1d0e1bdcfc
Binary files /dev/null and b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_default.png differ
diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_defaultSelected.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_defaultSelected.png
new file mode 100644
index 0000000000..ef916b710b
Binary files /dev/null and b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegatePerInstanceInheritedDataTest/baseline/openPBRSurfaceDefaultMaterial/defaultMaterialBillboards_defaultSelected.png differ
diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
index 0a13e5e448..ea413f07d1 100644
--- a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
+++ b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
@@ -56,8 +56,11 @@ def setUpClass(cls):
         cls._testDir = os.path.abspath('.')
 
         cls._imageVersion = None
-        if maya.mel.eval("defaultShaderName") != "standardSurface1":
+        defaultSurfaceName = maya.mel.eval("defaultShaderName")
+        if defaultSurfaceName == "lambert1":
             cls._imageVersion = 'lambertDefaultMaterial'
+        elif defaultSurfaceName == "openPBRSurface1":
+            cls._imageVersion = 'openPBRSurfaceDefaultMaterial'
 
     @classmethod
     def tearDownClass(cls):