diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass_EDS.shader b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass_EDS.shader
index 6adbba952d..359c9d7003 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass_EDS.shader
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass_EDS.shader
@@ -49,5 +49,5 @@
       ]
     },
 
-    "DrawList" : "forward"
+    "DrawList" : "forwardWithSubsurfaceOutput"
 }
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material
index 4be87e1a25..4650425e5a 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material
@@ -1,20 +1,33 @@
 {
     "description": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/EnhancedPBR.materialtype",
     "parentMaterial": "",
     "propertyLayoutVersion": 3,
     "properties": {
+        "emissive": {
+            "color": [
+                1.0,
+                0.0,
+                0.0,
+                1.0
+            ],
+            "intensity": 4.119999885559082
+        },
         "subsurfaceScattering": {
             "enableSubsurfaceScattering": true,
             "influenceMap": "TestData/Textures/checker8x8_512.png",
             "scatterColor": [
                 1.0,
-                0.19937437772750855,
-                0.07179369777441025,
+                0.20000000298023225,
+                0.07058823853731156,
                 1.0
             ],
             "scatterDistance": 40.0,
-            "subsurfaceScatterFactor": 1.0
+            "subsurfaceScatterFactor": 1.0,
+            "thickness": 0.41999998688697817,
+            "transmissionMode": "ThinObject",
+            "transmissionScale": 6.599999904632568,
+            "useThicknessMap": false
         }
     }
 }
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material
index 843df87038..997aa33467 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material
@@ -1,11 +1,12 @@
 {
     "description": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/EnhancedPBR.materialtype",
     "parentMaterial": "",
     "propertyLayoutVersion": 3,
     "properties": {
         "subsurfaceScattering": {
             "enableSubsurfaceScattering": true,
+            "enableTransmission": true,
             "scatterDistance": 64.6464614868164,
             "subsurfaceScatterFactor": 1.0,
             "thicknessMap": "TestData/Textures/checker8x8_512.png",