39 files changed, 4 insertions, 8 deletions

diff --git a/SConstruct b/SConstruct
index 127b3ff35..c529021d5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 
 EnsureSConsVersion(0, 14)
@@ -360,7 +361,6 @@ if selected_platform in platform_list:
     SConscript("scene/SCsub")
     SConscript("tools/SCsub")
     SConscript("drivers/SCsub")
-    SConscript("bin/SCsub")
 
     SConscript("modules/SCsub")
     SConscript("main/SCsub")
diff --git a/bin/SCsub b/bin/SCsub
deleted file mode 100644
index 52f7e3bb3..000000000
--- a/bin/SCsub
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/python
-
-Import('env')
-Export('env')
-
-SConscript('tests/SCsub')
diff --git a/main/SCsub b/main/SCsub
index a83563f44..a09b7c439 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 76d4dea78..4f8fdfe7e 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -47,7 +47,7 @@
 #include "script_language.h"
 #include "io/resource_loader.h"
 
-#include "bin/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/bin/tests/SCsub b/main/tests/SCsub
index 03495c064..03495c064 100644
--- a/bin/tests/SCsub
+++ b/main/tests/SCsub
diff --git a/bin/tests/test_containers.cpp b/main/tests/test_containers.cpp
index 4bc297d0b..4bc297d0b 100644
--- a/bin/tests/test_containers.cpp
+++ b/main/tests/test_containers.cpp
diff --git a/bin/tests/test_containers.h b/main/tests/test_containers.h
index 72d5c0ff7..72d5c0ff7 100644
--- a/bin/tests/test_containers.h
+++ b/main/tests/test_containers.h
diff --git a/bin/tests/test_detailer.cpp b/main/tests/test_detailer.cpp
index 5dba7c3f7..5dba7c3f7 100644
--- a/bin/tests/test_detailer.cpp
+++ b/main/tests/test_detailer.cpp
diff --git a/bin/tests/test_detailer.h b/main/tests/test_detailer.h
index 597e088ca..597e088ca 100644
--- a/bin/tests/test_detailer.h
+++ b/main/tests/test_detailer.h
diff --git a/bin/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp
index 4457d70b3..4457d70b3 100644
--- a/bin/tests/test_gdscript.cpp
+++ b/main/tests/test_gdscript.cpp
diff --git a/bin/tests/test_gdscript.h b/main/tests/test_gdscript.h
index 225654e2a..225654e2a 100644
--- a/bin/tests/test_gdscript.h
+++ b/main/tests/test_gdscript.h
diff --git a/bin/tests/test_gui.cpp b/main/tests/test_gui.cpp
index f4341fd7b..f4341fd7b 100644
--- a/bin/tests/test_gui.cpp
+++ b/main/tests/test_gui.cpp
diff --git a/bin/tests/test_gui.h b/main/tests/test_gui.h
index 5526320b0..5526320b0 100644
--- a/bin/tests/test_gui.h
+++ b/main/tests/test_gui.h
diff --git a/bin/tests/test_image.cpp b/main/tests/test_image.cpp
index bf9851cf0..bf9851cf0 100644
--- a/bin/tests/test_image.cpp
+++ b/main/tests/test_image.cpp
diff --git a/bin/tests/test_image.h b/main/tests/test_image.h
index 09b33e799..09b33e799 100644
--- a/bin/tests/test_image.h
+++ b/main/tests/test_image.h
diff --git a/bin/tests/test_io.cpp b/main/tests/test_io.cpp
index a8e8d7d0f..a8e8d7d0f 100644
--- a/bin/tests/test_io.cpp
+++ b/main/tests/test_io.cpp
diff --git a/bin/tests/test_io.h b/main/tests/test_io.h
index c839590ab..c839590ab 100644
--- a/bin/tests/test_io.h
+++ b/main/tests/test_io.h
diff --git a/bin/tests/test_main.cpp b/main/tests/test_main.cpp
index 363aede96..363aede96 100644
--- a/bin/tests/test_main.cpp
+++ b/main/tests/test_main.cpp
diff --git a/bin/tests/test_main.h b/main/tests/test_main.h
index c8d571a7d..c8d571a7d 100644
--- a/bin/tests/test_main.h
+++ b/main/tests/test_main.h
diff --git a/bin/tests/test_math.cpp b/main/tests/test_math.cpp
index 4b686e8af..4b686e8af 100644
--- a/bin/tests/test_math.cpp
+++ b/main/tests/test_math.cpp
diff --git a/bin/tests/test_math.h b/main/tests/test_math.h
index 492c3a183..492c3a183 100644
--- a/bin/tests/test_math.h
+++ b/main/tests/test_math.h
diff --git a/bin/tests/test_misc.cpp b/main/tests/test_misc.cpp
index 68564c62b..68564c62b 100644
--- a/bin/tests/test_misc.cpp
+++ b/main/tests/test_misc.cpp
diff --git a/bin/tests/test_misc.h b/main/tests/test_misc.h
index 55608f6a0..55608f6a0 100644
--- a/bin/tests/test_misc.h
+++ b/main/tests/test_misc.h
diff --git a/bin/tests/test_particles.cpp b/main/tests/test_particles.cpp
index 23a4b9e63..23a4b9e63 100644
--- a/bin/tests/test_particles.cpp
+++ b/main/tests/test_particles.cpp
diff --git a/bin/tests/test_particles.h b/main/tests/test_particles.h
index e95637a4e..e95637a4e 100644
--- a/bin/tests/test_particles.h
+++ b/main/tests/test_particles.h
diff --git a/bin/tests/test_physics.cpp b/main/tests/test_physics.cpp
index ecd90a13d..ecd90a13d 100644
--- a/bin/tests/test_physics.cpp
+++ b/main/tests/test_physics.cpp
diff --git a/bin/tests/test_physics.h b/main/tests/test_physics.h
index 5b6a54f2d..5b6a54f2d 100644
--- a/bin/tests/test_physics.h
+++ b/main/tests/test_physics.h
diff --git a/bin/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp
index c5fb73499..c5fb73499 100644
--- a/bin/tests/test_physics_2d.cpp
+++ b/main/tests/test_physics_2d.cpp
diff --git a/bin/tests/test_physics_2d.h b/main/tests/test_physics_2d.h
index e2eb1f402..e2eb1f402 100644
--- a/bin/tests/test_physics_2d.h
+++ b/main/tests/test_physics_2d.h
diff --git a/bin/tests/test_python.cpp b/main/tests/test_python.cpp
index f4a3d7a3a..f4a3d7a3a 100644
--- a/bin/tests/test_python.cpp
+++ b/main/tests/test_python.cpp
diff --git a/bin/tests/test_python.h b/main/tests/test_python.h
index 77e9603fe..77e9603fe 100644
--- a/bin/tests/test_python.h
+++ b/main/tests/test_python.h
diff --git a/bin/tests/test_render.cpp b/main/tests/test_render.cpp
index 9c3a287af..9c3a287af 100644
--- a/bin/tests/test_render.cpp
+++ b/main/tests/test_render.cpp
diff --git a/bin/tests/test_render.h b/main/tests/test_render.h
index 6993e75b9..6993e75b9 100644
--- a/bin/tests/test_render.h
+++ b/main/tests/test_render.h
diff --git a/bin/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp
index 9c0075c47..9c0075c47 100644
--- a/bin/tests/test_shader_lang.cpp
+++ b/main/tests/test_shader_lang.cpp
diff --git a/bin/tests/test_shader_lang.h b/main/tests/test_shader_lang.h
index f129fb224..f129fb224 100644
--- a/bin/tests/test_shader_lang.h
+++ b/main/tests/test_shader_lang.h
diff --git a/bin/tests/test_sound.cpp b/main/tests/test_sound.cpp
index 44cc117e0..44cc117e0 100644
--- a/bin/tests/test_sound.cpp
+++ b/main/tests/test_sound.cpp
diff --git a/bin/tests/test_sound.h b/main/tests/test_sound.h
index 91b87a226..91b87a226 100644
--- a/bin/tests/test_sound.h
+++ b/main/tests/test_sound.h
diff --git a/bin/tests/test_string.cpp b/main/tests/test_string.cpp
index 4496b9400..4496b9400 100644
--- a/bin/tests/test_string.cpp
+++ b/main/tests/test_string.cpp
diff --git a/bin/tests/test_string.h b/main/tests/test_string.h
index 7b3cd9a01..7b3cd9a01 100644
--- a/bin/tests/test_string.h
+++ b/main/tests/test_string.h