diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 3a5fe558..921fddd8 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -250,7 +250,7 @@ bool CompileFile(char *fileName, ShHandle compiler, int debugOptions, const TBui
     for (int i = 0; i < 1000; ++i) {
         for (int j = 0; j < 100; ++j)
 #endif
-            ret = ShCompile(compiler, data, OutputMultipleStrings, EShOptNone, resources, debugOptions);
+            ret = ShCompile(compiler, data, OutputMultipleStrings, EShOptNone, resources, debugOptions, 100);
 #ifdef MEASURE_MEMORY
 
         GetProcessMemoryInfo(GetCurrentProcess(), &counters, sizeof(counters));
diff --git a/Test/cppIndent.vert b/Test/cppIndent.vert
index a468e77a..078776a3 100644
--- a/Test/cppIndent.vert
+++ b/Test/cppIndent.vert
@@ -1,3 +1,5 @@
+#version 110
+
 #define ON
 
 float sum = 0.0;
diff --git a/Test/cppNest.vert b/Test/cppNest.vert
index 0bc97dde..41c5a6a4 100644
--- a/Test/cppNest.vert
+++ b/Test/cppNest.vert
@@ -1,3 +1,5 @@
+#version 110
+
 #define ON
 
 float sum = 0.0;
diff --git a/Test/cppSimple.vert b/Test/cppSimple.vert
index 64eb2b81..07c5628f 100644
--- a/Test/cppSimple.vert
+++ b/Test/cppSimple.vert
@@ -1,3 +1,5 @@
+#version 110
+
 #define ON
 
 float sum = 0.0;
diff --git a/Test/sample.frag b/Test/sample.frag
index af3a6265..540b4a74 100644
--- a/Test/sample.frag
+++ b/Test/sample.frag
@@ -31,6 +31,7 @@
 //ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 //POSSIBILITY OF SUCH DAMAGE.
 //
+#version 110
 
 varying vec3 color;
 
diff --git a/Test/sample.vert b/Test/sample.vert
index 0ecaf2c3..8cda91f9 100644
--- a/Test/sample.vert
+++ b/Test/sample.vert
@@ -31,6 +31,7 @@
 //ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 //POSSIBILITY OF SUCH DAMAGE.
 //
+#version 110
 
 varying vec3 color;
 
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index 92d2e54a..c968b757 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -77,7 +77,10 @@ void TParseContext::setVersion(int newVersion)
 			defaultPrecision[EbtSampler2D] = EpqLow;
 			defaultPrecision[EbtSamplerCube] = EpqLow;
         }
-	}
+	} else {
+        for (int type = 0; type < EbtNumTypes; ++type)
+            defaultPrecision[type] = EpqNone;
+    }
 }
 
 // Important assumption:  SetVersion() is called before SetProfile(), and is always called