diff --git a/test/core/pthread/emscripten_futex_api_basics.c b/test/core/pthread/emscripten_futex_api_basics.c
index 9786d306d810d..21b96de79d2bd 100644
--- a/test/core/pthread/emscripten_futex_api_basics.c
+++ b/test/core/pthread/emscripten_futex_api_basics.c
@@ -30,5 +30,5 @@ int main() {
   rc = emscripten_futex_wake(NULL, 1);
   assert(rc == -EINVAL/*-EFAULT*/);
 
-  printf("OK\n");
+  printf("done\n");
 }
diff --git a/test/core/pthread/emscripten_futex_api_basics.out b/test/core/pthread/emscripten_futex_api_basics.out
index d86bac9de59ab..19f86f493ab11 100644
--- a/test/core/pthread/emscripten_futex_api_basics.out
+++ b/test/core/pthread/emscripten_futex_api_basics.out
@@ -1 +1 @@
-OK
+done
diff --git a/test/core/pthread/test_emscripten_atomics.c b/test/core/pthread/test_emscripten_atomics.c
index 2c202e6d05c1d..0fc162760f006 100644
--- a/test/core/pthread/test_emscripten_atomics.c
+++ b/test/core/pthread/test_emscripten_atomics.c
@@ -49,6 +49,6 @@ int main() {
   assert(buffer[7] == 0xde);
   assert(buffer[8] == OLD);
 
-  printf("OK\n");
+  printf("done\n");
 }
 
diff --git a/test/core/pthread/test_emscripten_atomics.out b/test/core/pthread/test_emscripten_atomics.out
index d86bac9de59ab..19f86f493ab11 100644
--- a/test/core/pthread/test_emscripten_atomics.out
+++ b/test/core/pthread/test_emscripten_atomics.out
@@ -1 +1 @@
-OK
+done
diff --git a/test/core/test_double_i64_conversion.c b/test/core/test_double_i64_conversion.c
index 4e396f7fb3948..f66b32e86a3f2 100644
--- a/test/core/test_double_i64_conversion.c
+++ b/test/core/test_double_i64_conversion.c
@@ -71,6 +71,6 @@ int main() {
   assert(eq(9007199254740992.0, 9007199254740992LL /* == 2^53 */));
   assert(eq(-9007199254740992.0, -9007199254740992LL /* == -2^53 */));
 
-  printf("OK!\n");
+  printf("done\n");
   return 0;
 }
diff --git a/test/core/test_double_i64_conversion.out b/test/core/test_double_i64_conversion.out
index d64066171aae5..19f86f493ab11 100644
--- a/test/core/test_double_i64_conversion.out
+++ b/test/core/test_double_i64_conversion.out
@@ -1 +1 @@
-OK!
+done
diff --git a/test/core/test_emulate_function_pointer_casts_directize.c b/test/core/test_emulate_function_pointer_casts_directize.c
index 702b9c3521193..38941f2c3d4b9 100644
--- a/test/core/test_emulate_function_pointer_casts_directize.c
+++ b/test/core/test_emulate_function_pointer_casts_directize.c
@@ -7,7 +7,9 @@
 
 typedef void (*two_arg_fn)(void *, void *);
 
-static void one_arg(void *p) { printf("OK\n"); }
+static void one_arg(void *p) {
+  printf("done\n");
+}
 
 static two_arg_fn hide_cast(void (*fn)(void *)) {
   two_arg_fn result = (two_arg_fn)fn;
diff --git a/test/core/test_emulate_function_pointer_casts_directize.out b/test/core/test_emulate_function_pointer_casts_directize.out
index d86bac9de59ab..19f86f493ab11 100644
--- a/test/core/test_emulate_function_pointer_casts_directize.out
+++ b/test/core/test_emulate_function_pointer_casts_directize.out
@@ -1 +1 @@
-OK
+done
diff --git a/test/core/test_mallinfo.c b/test/core/test_mallinfo.c
index 08bf4c25b7434..ee3a164a2e403 100644
--- a/test/core/test_mallinfo.c
+++ b/test/core/test_mallinfo.c
@@ -51,5 +51,5 @@ int main() {
   assert(getTotalMemory() == total_mem);
   assert(getFreeMemory() == free_mem);
 
-  printf("OK.\n");
+  printf("done\n");
 }
diff --git a/test/core/test_mallinfo.out b/test/core/test_mallinfo.out
index d5c32f4ac0c74..19f86f493ab11 100644
--- a/test/core/test_mallinfo.out
+++ b/test/core/test_mallinfo.out
@@ -1 +1 @@
-OK.
+done
diff --git a/test/core/test_utf16.cpp b/test/core/test_utf16.cpp
index 62a8a59f3eebc..f7179a9c904e6 100644
--- a/test/core/test_utf16.cpp
+++ b/test/core/test_utf16.cpp
@@ -65,5 +65,5 @@ int main() {
   testString(u"a");
   testString(u"");
 
-  printf("OK.\n");
+  printf("done\n");
 }
diff --git a/test/core/test_utf8.c b/test/core/test_utf8.c
index ac724a399f047..c195e3bd28561 100644
--- a/test/core/test_utf8.c
+++ b/test/core/test_utf8.c
@@ -81,5 +81,5 @@ int main() {
   }, utf8String, utf8String2, 0);
   assert(utf8String2[0] == 'X');
 
-  printf("OK.\n");
+  printf("done\n");
 }
diff --git a/test/core/test_wrap_malloc.c b/test/core/test_wrap_malloc.c
index bf80e598ceadf..e72bab3aa0c47 100644
--- a/test/core/test_wrap_malloc.c
+++ b/test/core/test_wrap_malloc.c
@@ -56,6 +56,6 @@ int main() {
   assert(totalAllocs == 21);
   assert(totalReallocs == 1);
   assert(totalFrees == 20);
-  emscripten_console_logf("OK.");
+  emscripten_console_logf("done");
   return 0;
 }
diff --git a/test/other/test_strptime_reentrant.c b/test/other/test_strptime_reentrant.c
index ffe87f661e8ed..4f07093818be0 100644
--- a/test/other/test_strptime_reentrant.c
+++ b/test/other/test_strptime_reentrant.c
@@ -62,5 +62,5 @@ int main() {
   assert(tm.tm_yday == 38);
 #endif
 
-  printf("OK\n");
+  printf("done\n");
 }
diff --git a/test/other/test_strptime_reentrant.out b/test/other/test_strptime_reentrant.out
index d86bac9de59ab..19f86f493ab11 100644
--- a/test/other/test_strptime_reentrant.out
+++ b/test/other/test_strptime_reentrant.out
@@ -1 +1 @@
-OK
+done
diff --git a/test/test_core.py b/test/test_core.py
index 855c203ea8780..12a07b18fc1b7 100644
--- a/test/test_core.py
+++ b/test/test_core.py
@@ -1426,10 +1426,10 @@ def test_exceptions_uncaught_2(self):
         if (std::uncaught_exceptions())
           std::cout << "ERROR: uncaught_exceptions still set.\n";
         else
-          std::cout << "OK\n";
+          std::cout << "done\n";
       }
     '''
-    self.do_run(src, 'OK\n')
+    self.do_run(src, 'done\n')
 
   @with_all_eh_sjlj
   def test_exceptions_typed(self):
@@ -2838,10 +2838,10 @@ def test_memcpy3(self):
 
   @also_with_standalone_wasm()
   def test_memcpy_alignment(self):
-    self.do_runf('test_memcpy_alignment.c', 'OK.')
+    self.do_runf('test_memcpy_alignment.c', 'done\n')
 
   def test_memset_alignment(self):
-    self.do_runf('test_memset_alignment.c', 'OK.')
+    self.do_runf('test_memset_alignment.c', 'done\n')
 
   def test_memset(self):
     self.do_core_test('test_memset.c')
@@ -5782,27 +5782,27 @@ def test_utf32_short_wchar(self):
   @with_both_text_decoder
   @crossplatform
   def test_utf16(self):
-    self.do_runf('core/test_utf16.cpp', 'OK.')
+    self.do_runf('core/test_utf16.cpp', 'done\n')
 
   @with_both_text_decoder
   def test_utf8(self):
-    self.do_runf('core/test_utf8.c', 'OK.')
+    self.do_runf('core/test_utf8.c', 'done\n')
 
   @with_both_text_decoder
   @also_without_bigint
   def test_utf8_bench(self):
     self.cflags += ['--embed-file', test_file('test_utf8_bench.txt') + '@/utf8_corpus.txt']
-    self.do_runf('test_utf8_bench.c', 'OK.')
+    self.do_runf('test_utf8_bench.c', 'done\n')
 
   # Test that invalid character in UTF8 does not cause decoding to crash.
   @with_both_text_decoder
   @also_with_minimal_runtime
   def test_utf8_invalid(self):
-    self.do_runf('test_utf8_invalid.c', 'OK.')
+    self.do_runf('test_utf8_invalid.c', 'done\n')
 
   def test_utf16_bench(self):
     self.cflags += ['--embed-file', test_file('test_utf16_bench.txt') + '@/utf16_corpus.txt']
-    self.do_runf('test_utf16_bench.c', 'OK.')
+    self.do_runf('test_utf16_bench.c', 'done\n')
 
   def test_wprintf(self):
     self.do_core_test('test_wprintf.cpp')
@@ -8659,7 +8659,7 @@ def test_mallinfo(self):
     'mimalloc': (['-sMALLOC=mimalloc', '-sABORTING_MALLOC=0'],),
   })
   def test_wrap_malloc(self, args):
-    self.do_runf('core/test_wrap_malloc.c', 'OK.', cflags=args)
+    self.do_runf('core/test_wrap_malloc.c', 'done\n', cflags=args)
 
   def test_environment(self):
     self.set_setting('ASSERTIONS')
diff --git a/test/test_memcpy_alignment.c b/test/test_memcpy_alignment.c
index 28c12c7868ddc..cf8a0453e21e3 100644
--- a/test/test_memcpy_alignment.c
+++ b/test/test_memcpy_alignment.c
@@ -77,5 +77,5 @@ int main() {
     }
   }
 
-  printf("OK.\n");
+  printf("done\n");
 }
diff --git a/test/test_memset_alignment.c b/test/test_memset_alignment.c
index c116a89a41a06..5b29f7ec1470c 100644
--- a/test/test_memset_alignment.c
+++ b/test/test_memset_alignment.c
@@ -68,5 +68,5 @@ int main() {
     }
   }
 
-  printf("OK.\n");
+  printf("done\n");
 }
diff --git a/test/test_other.py b/test/test_other.py
index 671914a230821..fa5190ecb6eb0 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -6957,11 +6957,9 @@ def test_dlopen_constructors(self):
         return 0;
       }''')
     self.run_process([EMCC, '-g', '-o', 'libside.wasm', 'side.c', '-sSIDE_MODULE'])
-    self.run_process([EMCC, '-g', '-sMAIN_MODULE=2', 'main.c', 'libside.wasm', '-sNO_AUTOLOAD_DYLIBS'])
-    self.assertContained('done\n', self.run_js('a.out.js'))
+    self.do_runf('main.c', 'done\n', cflags=['-g', '-sMAIN_MODULE=2', 'libside.wasm', '-sNO_AUTOLOAD_DYLIBS'])
     # Repeat the test without NO_AUTOLOAD_DYLIBS
-    self.run_process([EMCC, '-g', '-sMAIN_MODULE=2', 'main.c', 'libside.wasm'])
-    self.assertContained('done\n', self.run_js('a.out.js'))
+    self.do_runf('main.c', 'done\n', cflags=['-g', '-sMAIN_MODULE=2', 'libside.wasm'])
 
   def test_dlopen_rtld_global(self):
     # This test checks RTLD_GLOBAL where a module is loaded
diff --git a/test/test_utf16_bench.c b/test/test_utf16_bench.c
index 0b78b0d3fd74a..8be011841381b 100644
--- a/test/test_utf16_bench.c
+++ b/test/test_utf16_bench.c
@@ -62,6 +62,7 @@ int main() {
     free(str);
   }
   double t3 = emscripten_get_now();
-  printf("OK. Time: %f (%f).\n", t, t3-t2);
+  printf("Time: %f (%f).\n", t, t3-t2);
+  printf("done\n");
   return 0;
 }
diff --git a/test/test_utf8_bench.c b/test/test_utf8_bench.c
index 378a59e5ae673..3df09a449e5fb 100644
--- a/test/test_utf8_bench.c
+++ b/test/test_utf8_bench.c
@@ -65,6 +65,7 @@ int main() {
     free(str);
   }
   double t3 = emscripten_get_now();
-  printf("OK. Time: %f (%f).\n", t, t3-t2);
+  printf("Time: %f (%f).\n", t, t3-t2);
+  printf("done\n");
   return 0;
 }
diff --git a/test/test_utf8_invalid.c b/test/test_utf8_invalid.c
index cdaa0208281db..2c2eced29323a 100644
--- a/test/test_utf8_invalid.c
+++ b/test/test_utf8_invalid.c
@@ -12,5 +12,6 @@ int main() {
   for (int i = 0; i < 256; ++i) {
     totalLen += EM_ASM_INT({return UTF8ToString($0).length}, ch);
   }
-  printf("OK. Length: %d\n", totalLen);
+  printf("Length: %d\n", totalLen);
+  printf("done\n");
 }