diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 1f7c5f25f..1986a2f0a 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -1306,6 +1306,8 @@ void usage()
            "    .geom   for a geometry shader\n"
            "    .frag   for a fragment shader\n"
            "    .comp   for a compute shader\n"
+           "    .glsl   for .vert.glsl, .tesc.glsl, ..., .comp.glsl compound suffixes\n"
+           "    .hlsl   for .vert.hlsl, .tesc.hlsl, ..., .comp.hlsl compound suffixes\n"
            "\n"
            "Options:\n"
            "  -C          cascading errors; risk crash from accumulation of error recoveries\n"
diff --git a/Test/baseResults/compoundsuffix.frag.hlsl b/Test/baseResults/compoundsuffix.frag.hlsl
new file mode 100644
index 000000000..be527a38e
--- /dev/null
+++ b/Test/baseResults/compoundsuffix.frag.hlsl
@@ -0,0 +1,27 @@
+compoundsuffix.frag.hlsl
+// Module Version 10000
+// Generated by (magic number): 80006
+// Id's are bound by 21
+
+                              Capability Shader
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main" 20
+                              ExecutionMode 4 OriginUpperLeft
+                              Source HLSL 500
+                              Name 4  "main"
+                              Name 20  "fragColor"
+                              Decorate 20(fragColor) Location 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeFloat 32
+               7:             TypeVector 6(float) 4
+              13:    6(float) Constant 1065353216
+              14:    7(fvec4) ConstantComposite 13 13 13 13
+              19:             TypePointer Output 7(fvec4)
+   20(fragColor):     19(ptr) Variable Output
+         4(main):           2 Function None 3
+               5:             Label
+                              Store 20(fragColor) 14
+                              Return
+                              FunctionEnd
diff --git a/Test/baseResults/compoundsuffix.vert.glsl b/Test/baseResults/compoundsuffix.vert.glsl
new file mode 100644
index 000000000..58354a409
--- /dev/null
+++ b/Test/baseResults/compoundsuffix.vert.glsl
@@ -0,0 +1,15 @@
+compoundsuffix.vert.glsl
+Shader version: 100
+0:? Sequence
+0:1  Function Definition: main( ( global void)
+0:1    Function Parameters: 
+0:3    Sequence
+0:3      move second child to first child ( temp highp 4-component vector of float)
+0:3        'gl_Position' ( gl_Position highp 4-component vector of float Position)
+0:3        Constant:
+0:3          1.000000
+0:3          1.000000
+0:3          1.000000
+0:3          1.000000
+0:?   Linker Objects
+
diff --git a/Test/compoundsuffix.frag.hlsl b/Test/compoundsuffix.frag.hlsl
new file mode 100644
index 000000000..59322acda
--- /dev/null
+++ b/Test/compoundsuffix.frag.hlsl
@@ -0,0 +1,6 @@
+void main(out float4 fragColor : SV_TARGET0)
+{
+    fragColor = 1;
+}
+
+
diff --git a/Test/compoundsuffix.vert.glsl b/Test/compoundsuffix.vert.glsl
new file mode 100755
index 000000000..26862fff1
--- /dev/null
+++ b/Test/compoundsuffix.vert.glsl
@@ -0,0 +1,4 @@
+void main()
+{
+    gl_Position = vec4(1.0);
+}
\ No newline at end of file
diff --git a/Test/runtests b/Test/runtests
index 6ebb6ee6b..93429a180 100755
--- a/Test/runtests
+++ b/Test/runtests
@@ -74,11 +74,15 @@ else
 fi
 
 #
-# Testing -S
+# Testing -S and compound suffixes
 #
-echo Running explicit stage test
+echo Running explicit stage test and compound suffix tests
 $EXE -i -S vert nosuffix > $TARGETDIR/nosuffix.out
 diff -b $BASEDIR/nosuffix.out $TARGETDIR/nosuffix.out || HASERROR=1
+$EXE -i compoundsuffix.vert.glsl > $TARGETDIR/compoundsuffix.vert.glsl
+diff -b $BASEDIR/compoundsuffix.vert.glsl $TARGETDIR/compoundsuffix.vert.glsl || HASERROR=1
+$EXE -D -e main -H compoundsuffix.frag.hlsl > $TARGETDIR/compoundsuffix.frag.hlsl
+diff -b $BASEDIR/compoundsuffix.frag.hlsl $TARGETDIR/compoundsuffix.frag.hlsl || HASERROR=1
 
 #
 # Testing --hlsl-offsets