30 files changed, 3 insertions, 2 deletions
diff --git a/core/SCsub b/core/SCsub
index 7e30cfa146..8d89f6427b 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -61,7 +61,6 @@ SConscript('os/SCsub')
 SConscript('math/SCsub')
 SConscript('io/SCsub')
 SConscript('bind/SCsub')
-SConscript('tests/SCsub')
 
 lib = env.Library("core", env.core_sources)
 
diff --git a/main/SCsub b/main/SCsub
index a83563f44d..a09b7c4396 100644
--- a/main/SCsub
+++ b/main/SCsub
@@ -7,6 +7,8 @@ env.add_source_files(env.main_sources, "*.cpp")
 
 Export('env')
 
+SConscript('tests/SCsub')
+
 lib = env.Library("main", env.main_sources)
 
 env.Prepend(LIBS=[lib])
diff --git a/main/main.cpp b/main/main.cpp
index e3827b9ba6..8d8aa9b5cb 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -47,7 +47,7 @@
 #include "script_language.h"
 #include "io/resource_loader.h"
 
-#include "core/tests/test_main.h"
+#include "main/tests/test_main.h"
 #include "os/dir_access.h"
 #include "core/io/ip.h"
 #include "scene/resources/packed_scene.h"
diff --git a/core/tests/SCsub b/main/tests/SCsub
index 03495c0649..03495c0649 100644
--- a/core/tests/SCsub
+++ b/main/tests/SCsub
diff --git a/core/tests/test_containers.cpp b/main/tests/test_containers.cpp
index 4bc297d0ba..4bc297d0ba 100644
--- a/core/tests/test_containers.cpp
+++ b/main/tests/test_containers.cpp
diff --git a/core/tests/test_containers.h b/main/tests/test_containers.h
index 72d5c0ff7a..72d5c0ff7a 100644
--- a/core/tests/test_containers.h
+++ b/main/tests/test_containers.h
diff --git a/core/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp
index 1ee27ec661..1ee27ec661 100644
--- a/core/tests/test_gdscript.cpp
+++ b/main/tests/test_gdscript.cpp
diff --git a/core/tests/test_gdscript.h b/main/tests/test_gdscript.h
index 225654e2a8..225654e2a8 100644
--- a/core/tests/test_gdscript.h
+++ b/main/tests/test_gdscript.h
diff --git a/core/tests/test_gui.cpp b/main/tests/test_gui.cpp
index bfce03d663..bfce03d663 100644
--- a/core/tests/test_gui.cpp
+++ b/main/tests/test_gui.cpp
diff --git a/core/tests/test_gui.h b/main/tests/test_gui.h
index 5526320b0c..5526320b0c 100644
--- a/core/tests/test_gui.h
+++ b/main/tests/test_gui.h
diff --git a/core/tests/test_image.cpp b/main/tests/test_image.cpp
index bf9851cf01..bf9851cf01 100644
--- a/core/tests/test_image.cpp
+++ b/main/tests/test_image.cpp
diff --git a/core/tests/test_image.h b/main/tests/test_image.h
index 09b33e799e..09b33e799e 100644
--- a/core/tests/test_image.h
+++ b/main/tests/test_image.h
diff --git a/core/tests/test_io.cpp b/main/tests/test_io.cpp
index 42664e73cd..42664e73cd 100644
--- a/core/tests/test_io.cpp
+++ b/main/tests/test_io.cpp
diff --git a/core/tests/test_io.h b/main/tests/test_io.h
index c839590ab9..c839590ab9 100644
--- a/core/tests/test_io.h
+++ b/main/tests/test_io.h
diff --git a/core/tests/test_main.cpp b/main/tests/test_main.cpp
index 1f7f2d7dda..1f7f2d7dda 100644
--- a/core/tests/test_main.cpp
+++ b/main/tests/test_main.cpp
diff --git a/core/tests/test_main.h b/main/tests/test_main.h
index c8d571a7dd..c8d571a7dd 100644
--- a/core/tests/test_main.h
+++ b/main/tests/test_main.h
diff --git a/core/tests/test_math.cpp b/main/tests/test_math.cpp
index b3b70986c9..b3b70986c9 100644
--- a/core/tests/test_math.cpp
+++ b/main/tests/test_math.cpp
diff --git a/core/tests/test_math.h b/main/tests/test_math.h
index 492c3a1837..492c3a1837 100644
--- a/core/tests/test_math.h
+++ b/main/tests/test_math.h
diff --git a/core/tests/test_physics.cpp b/main/tests/test_physics.cpp
index b1a7af8dad..b1a7af8dad 100644
--- a/core/tests/test_physics.cpp
+++ b/main/tests/test_physics.cpp
diff --git a/core/tests/test_physics.h b/main/tests/test_physics.h
index 5b6a54f2d4..5b6a54f2d4 100644
--- a/core/tests/test_physics.h
+++ b/main/tests/test_physics.h
diff --git a/core/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp
index 39b4e7edda..39b4e7edda 100644
--- a/core/tests/test_physics_2d.cpp
+++ b/main/tests/test_physics_2d.cpp
diff --git a/core/tests/test_physics_2d.h b/main/tests/test_physics_2d.h
index e2eb1f4023..e2eb1f4023 100644
--- a/core/tests/test_physics_2d.h
+++ b/main/tests/test_physics_2d.h
diff --git a/core/tests/test_render.cpp b/main/tests/test_render.cpp
index 51e1366073..51e1366073 100644
--- a/core/tests/test_render.cpp
+++ b/main/tests/test_render.cpp
diff --git a/core/tests/test_render.h b/main/tests/test_render.h
index 6993e75b9f..6993e75b9f 100644
--- a/core/tests/test_render.h
+++ b/main/tests/test_render.h
diff --git a/core/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp
index 1a677bcbe2..1a677bcbe2 100644
--- a/core/tests/test_shader_lang.cpp
+++ b/main/tests/test_shader_lang.cpp
diff --git a/core/tests/test_shader_lang.h b/main/tests/test_shader_lang.h
index f129fb224a..f129fb224a 100644
--- a/core/tests/test_shader_lang.h
+++ b/main/tests/test_shader_lang.h
diff --git a/core/tests/test_sound.cpp b/main/tests/test_sound.cpp
index 44cc117e02..44cc117e02 100644
--- a/core/tests/test_sound.cpp
+++ b/main/tests/test_sound.cpp
diff --git a/core/tests/test_sound.h b/main/tests/test_sound.h
index 91b87a2261..91b87a2261 100644
--- a/core/tests/test_sound.h
+++ b/main/tests/test_sound.h
diff --git a/core/tests/test_string.cpp b/main/tests/test_string.cpp
index d99ad4476f..d99ad4476f 100644
--- a/core/tests/test_string.cpp
+++ b/main/tests/test_string.cpp
diff --git a/core/tests/test_string.h b/main/tests/test_string.h
index 7b3cd9a019..7b3cd9a019 100644
--- a/core/tests/test_string.h
+++ b/main/tests/test_string.h