diff --git a/test/core/test_getgep.c b/test/core/test_getgep.c
deleted file mode 100644
index 11fc80b45c0e1..0000000000000
--- a/test/core/test_getgep.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2016 The Emscripten Authors.  All rights reserved.
- * Emscripten is available under two separate licenses, the MIT license and the
- * University of Illinois/NCSA Open Source License.  Both these licenses can be
- * found in the LICENSE file.
- */
-
-#include <stdio.h>
-struct {
-  int y[10];
-  int z[10];
-} commonblock;
-
-int main() {
-  for (int i = 0; i < 10; ++i) {
-    commonblock.y[i] = 1;
-    commonblock.z[i] = 2;
-  }
-  printf("*%d %d*\n", commonblock.y[0], commonblock.z[0]);
-  return 0;
-}
diff --git a/test/core/test_getgep.out b/test/core/test_getgep.out
deleted file mode 100644
index a53d59ff64f0c..0000000000000
--- a/test/core/test_getgep.out
+++ /dev/null
@@ -1 +0,0 @@
-*1 2*
\ No newline at end of file
diff --git a/test/core/test_erf.c b/test/other/test_erf.c
similarity index 100%
rename from test/core/test_erf.c
rename to test/other/test_erf.c
diff --git a/test/core/test_erf.out b/test/other/test_erf.out
similarity index 100%
rename from test/core/test_erf.out
rename to test/other/test_erf.out
diff --git a/test/core/test_fcvt.cpp b/test/other/test_fcvt.cpp
similarity index 100%
rename from test/core/test_fcvt.cpp
rename to test/other/test_fcvt.cpp
diff --git a/test/core/test_fcvt.out b/test/other/test_fcvt.out
similarity index 100%
rename from test/core/test_fcvt.out
rename to test/other/test_fcvt.out
diff --git a/test/core/test_frexp.c b/test/other/test_frexp.c
similarity index 100%
rename from test/core/test_frexp.c
rename to test/other/test_frexp.c
diff --git a/test/core/test_frexp.out b/test/other/test_frexp.out
similarity index 100%
rename from test/core/test_frexp.out
rename to test/other/test_frexp.out
diff --git a/test/core/test_llrint.c b/test/other/test_llrint.c
similarity index 100%
rename from test/core/test_llrint.c
rename to test/other/test_llrint.c
diff --git a/test/core/test_llrint.out b/test/other/test_llrint.out
similarity index 100%
rename from test/core/test_llrint.out
rename to test/other/test_llrint.out
diff --git a/test/core/test_math_hyperbolic.c b/test/other/test_math_hyperbolic.c
similarity index 100%
rename from test/core/test_math_hyperbolic.c
rename to test/other/test_math_hyperbolic.c
diff --git a/test/core/test_math_hyperbolic.out b/test/other/test_math_hyperbolic.out
similarity index 100%
rename from test/core/test_math_hyperbolic.out
rename to test/other/test_math_hyperbolic.out
diff --git a/test/test_core.py b/test/test_core.py
index 9ccb8e3ee76f4..13aa105598daf 100644
--- a/test/test_core.py
+++ b/test/test_core.py
@@ -760,42 +760,26 @@ def test_zero_multiplication(self):
   def test_isnan(self):
     self.do_core_test('test_isnan.c')
 
+  @only_wasm2js('tests globals in static data')
   def test_globaldoubles(self):
     self.do_core_test('test_globaldoubles.c')
 
   def test_math(self):
     self.do_core_test('test_math.c')
 
-  def test_erf(self):
-    self.do_core_test('test_erf.c')
-
-  def test_math_hyperbolic(self):
-    self.do_core_test('test_math_hyperbolic.c')
-
+  @only_wasm2js('tests lgamma and signbit')
   def test_math_lgamma(self):
     self.do_run_in_out_file_test('math/lgamma.c', assert_returncode=NON_ZERO)
 
+  @only_wasm2js('tests fmodf (which may use JS math)')
   def test_math_fmodf(self):
     self.do_run_in_out_file_test('math/fmodf.c')
 
-  def test_frexp(self):
-    self.do_core_test('test_frexp.c')
-
   def test_rounding(self):
     # needs to flush stdio streams
     self.set_setting('EXIT_RUNTIME')
     self.do_core_test('test_rounding.c')
 
-  def test_fcvt(self):
-    self.do_core_test('test_fcvt.cpp')
-
-  def test_llrint(self):
-    self.do_core_test('test_llrint.c')
-
-  def test_getgep(self):
-    # Generated code includes getelementptr (getelementptr, 0, 1), i.e., GEP as the first param to GEP
-    self.do_core_test('test_getgep.c')
-
   def test_multiply_defined_symbols(self):
     create_file('a1.c', 'int f() { return 1; }')
     create_file('a2.c', 'void x() {}')
diff --git a/test/test_other.py b/test/test_other.py
index 960f3ac5b730a..a125e0885c0a1 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -14245,3 +14245,18 @@ def test_force_filesystem_error(self):
   def test_aligned_alloc(self):
     self.do_runf('test_aligned_alloc.c', '',
                  emcc_args=['-Wno-non-power-of-two-alignment'])
+
+  def test_erf(self):
+    self.do_other_test('test_erf.c')
+
+  def test_math_hyperbolic(self):
+    self.do_other_test('test_math_hyperbolic.c')
+
+  def test_frexp(self):
+    self.do_other_test('test_frexp.c')
+
+  def test_fcvt(self):
+    self.do_other_test('test_fcvt.cpp')
+
+  def test_llrint(self):
+    self.do_other_test('test_llrint.c')