diff --git a/src/lib/libglemu.js b/src/lib/libglemu.js
index e5fcf78994d87..a76ce93f2b5c4 100644
--- a/src/lib/libglemu.js
+++ b/src/lib/libglemu.js
@@ -34,43 +34,41 @@ var LibraryGLEmulation = {
     'glVertexAttribPointer', 'glActiveTexture', '$stringToNewUTF8',
     '$ptrToString', '$getEmscriptenSupportedExtensions',
   ],
-  $GLEmulation__postset:
-#if MAYBE_CLOSURE_COMPILER
-    // Forward declare GL functions that are overridden by GLEmulation here to appease Closure compiler.
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawArrays;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawElements;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glActiveTexture;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnable;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisable;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvf;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvi;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvfv;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetIntegerv;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glIsEnabled;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetBooleanv;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetString;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCreateShader;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glShaderSource;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCompileShader;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glAttachShader;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDetachShader;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glUseProgram;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDeleteProgram;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindAttribLocation;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glLinkProgram;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindBuffer;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetFloatv;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glHint;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnableVertexAttribArray;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisableVertexAttribArray;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glVertexAttribPointer;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _glTexEnvf;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _glTexEnvi;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _glTexEnvfv;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnviv;' +
-    '/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnvfv;' +
-#endif
-    'GLEmulation.init();',
+  $GLEmulation__postset: `
+    // Forward declare GL functions that are overridden by GLEmulation.
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawArrays;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawElements;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glActiveTexture;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnable;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisable;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvf;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvi;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvfv;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetIntegerv;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glIsEnabled;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetBooleanv;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetString;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glCreateShader;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glShaderSource;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glCompileShader;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glAttachShader;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glDetachShader;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glUseProgram;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glDeleteProgram;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindAttribLocation;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glLinkProgram;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindBuffer;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetFloatv;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glHint;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnableVertexAttribArray;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisableVertexAttribArray;
+    /**@suppress {duplicate, undefinedVars}*/var _emscripten_glVertexAttribPointer;
+    /**@suppress {duplicate, undefinedVars}*/var _glTexEnvf;
+    /**@suppress {duplicate, undefinedVars}*/var _glTexEnvi;
+    /**@suppress {duplicate, undefinedVars}*/var _glTexEnvfv;
+    /**@suppress {duplicate, undefinedVars}*/var _glGetTexEnviv;
+    /**@suppress {duplicate, undefinedVars}*/var _glGetTexEnvfv;
+    GLEmulation.init();`,
   $GLEmulation: {
     // Fog support. Partial, we assume shaders are used that implement fog. We just pass them uniforms
     fogStart: 0,
diff --git a/test/browser/glut_touchevents.c b/test/browser/glut_touchevents.c
index ddd6ad6b584c1..7214c2f4b2af7 100644
--- a/test/browser/glut_touchevents.c
+++ b/test/browser/glut_touchevents.c
@@ -68,7 +68,6 @@ int main(int argc, char *argv[])
         touches.item = function(i) { return this[i]; };
 
         var event = document.createEvent('UIEvent');
-        event.target = Module['canvas'];
         event.button = 0;
         event.changedTouches = touches;
         event.initUIEvent(eventType, true, true, window, 1);
diff --git a/test/embind/test_pthreads.cpp b/test/embind/test_pthreads.cpp
index 3a3939d2fb2ad..caa1f23feb794 100644
--- a/test/embind/test_pthreads.cpp
+++ b/test/embind/test_pthreads.cpp
@@ -8,7 +8,7 @@ using namespace emscripten;
 
 void thread(void) {
   EM_ASM({
-    globalProperty = {
+    globalThis.globalProperty = {
       foo: function(value) {
         return value;
       }
diff --git a/test/other/test_runtime_keepalive.cpp b/test/other/test_runtime_keepalive.cpp
index 3bccbe9743484..9f1cf5fc450f3 100644
--- a/test/other/test_runtime_keepalive.cpp
+++ b/test/other/test_runtime_keepalive.cpp
@@ -8,7 +8,7 @@ int main() {
     Module["onExit"] = () => { out("onExit"); };
     runtimeKeepalivePush();
     out("runtimeKeepalivePush done");
-    counter = 0;
+    var counter = 0;
     function timerCallback() {
       if (counter < 5) {
         runtimeKeepalivePush();
diff --git a/test/test_browser.py b/test/test_browser.py
index 59a979bddcfff..92e54e944cd63 100644
--- a/test/test_browser.py
+++ b/test/test_browser.py
@@ -944,7 +944,7 @@ def test_sdl_stb_image_cleanup(self):
     'safe_heap_O2': (['-sSAFE_HEAP', '-O2'],),
   })
   def test_sdl_canvas(self, args):
-    self.btest_exit('test_sdl_canvas.c', cflags=['-sLEGACY_GL_EMULATION', '-lSDL', '-lGL'] + args)
+    self.btest_exit('test_sdl_canvas.c', cflags=['-sSTRICT_JS', '-sLEGACY_GL_EMULATION', '-lSDL', '-lGL'] + args)
 
   def test_sdl_canvas_alpha(self):
     # N.B. On Linux with Intel integrated graphics cards, this test needs Firefox 49 or newer.
@@ -1058,7 +1058,7 @@ def test_sdl_mouse_offsets(self):
     self.run_browser('page.html', '', '/report_result?exit:0')
 
   def test_glut_touchevents(self):
-    self.btest_exit('glut_touchevents.c', cflags=['-lglut'])
+    self.btest_exit('glut_touchevents.c', cflags=['-lglut', '-sSTRICT_JS'])
 
   def test_glut_wheelevents(self):
     self.btest_exit('glut_wheelevents.c', cflags=['-lglut'])