diff --git a/SConstruct b/SConstruct
index 127b3ff35ee..c529021d557 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 52f7e3bb399..00000000000
--- 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 a83563f44da..a09b7c4396e 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 76d4dea7824..4f8fdfe7ed8 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
similarity index 100%
rename from bin/tests/SCsub
rename to main/tests/SCsub
diff --git a/bin/tests/test_containers.cpp b/main/tests/test_containers.cpp
similarity index 100%
rename from bin/tests/test_containers.cpp
rename to main/tests/test_containers.cpp
diff --git a/bin/tests/test_containers.h b/main/tests/test_containers.h
similarity index 100%
rename from bin/tests/test_containers.h
rename to main/tests/test_containers.h
diff --git a/bin/tests/test_detailer.cpp b/main/tests/test_detailer.cpp
similarity index 100%
rename from bin/tests/test_detailer.cpp
rename to main/tests/test_detailer.cpp
diff --git a/bin/tests/test_detailer.h b/main/tests/test_detailer.h
similarity index 100%
rename from bin/tests/test_detailer.h
rename to main/tests/test_detailer.h
diff --git a/bin/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp
similarity index 100%
rename from bin/tests/test_gdscript.cpp
rename to main/tests/test_gdscript.cpp
diff --git a/bin/tests/test_gdscript.h b/main/tests/test_gdscript.h
similarity index 100%
rename from bin/tests/test_gdscript.h
rename to main/tests/test_gdscript.h
diff --git a/bin/tests/test_gui.cpp b/main/tests/test_gui.cpp
similarity index 100%
rename from bin/tests/test_gui.cpp
rename to main/tests/test_gui.cpp
diff --git a/bin/tests/test_gui.h b/main/tests/test_gui.h
similarity index 100%
rename from bin/tests/test_gui.h
rename to main/tests/test_gui.h
diff --git a/bin/tests/test_image.cpp b/main/tests/test_image.cpp
similarity index 100%
rename from bin/tests/test_image.cpp
rename to main/tests/test_image.cpp
diff --git a/bin/tests/test_image.h b/main/tests/test_image.h
similarity index 100%
rename from bin/tests/test_image.h
rename to main/tests/test_image.h
diff --git a/bin/tests/test_io.cpp b/main/tests/test_io.cpp
similarity index 100%
rename from bin/tests/test_io.cpp
rename to main/tests/test_io.cpp
diff --git a/bin/tests/test_io.h b/main/tests/test_io.h
similarity index 100%
rename from bin/tests/test_io.h
rename to main/tests/test_io.h
diff --git a/bin/tests/test_main.cpp b/main/tests/test_main.cpp
similarity index 100%
rename from bin/tests/test_main.cpp
rename to main/tests/test_main.cpp
diff --git a/bin/tests/test_main.h b/main/tests/test_main.h
similarity index 100%
rename from bin/tests/test_main.h
rename to main/tests/test_main.h
diff --git a/bin/tests/test_math.cpp b/main/tests/test_math.cpp
similarity index 100%
rename from bin/tests/test_math.cpp
rename to main/tests/test_math.cpp
diff --git a/bin/tests/test_math.h b/main/tests/test_math.h
similarity index 100%
rename from bin/tests/test_math.h
rename to main/tests/test_math.h
diff --git a/bin/tests/test_misc.cpp b/main/tests/test_misc.cpp
similarity index 100%
rename from bin/tests/test_misc.cpp
rename to main/tests/test_misc.cpp
diff --git a/bin/tests/test_misc.h b/main/tests/test_misc.h
similarity index 100%
rename from bin/tests/test_misc.h
rename to main/tests/test_misc.h
diff --git a/bin/tests/test_particles.cpp b/main/tests/test_particles.cpp
similarity index 100%
rename from bin/tests/test_particles.cpp
rename to main/tests/test_particles.cpp
diff --git a/bin/tests/test_particles.h b/main/tests/test_particles.h
similarity index 100%
rename from bin/tests/test_particles.h
rename to main/tests/test_particles.h
diff --git a/bin/tests/test_physics.cpp b/main/tests/test_physics.cpp
similarity index 100%
rename from bin/tests/test_physics.cpp
rename to main/tests/test_physics.cpp
diff --git a/bin/tests/test_physics.h b/main/tests/test_physics.h
similarity index 100%
rename from bin/tests/test_physics.h
rename to main/tests/test_physics.h
diff --git a/bin/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp
similarity index 100%
rename from bin/tests/test_physics_2d.cpp
rename to main/tests/test_physics_2d.cpp
diff --git a/bin/tests/test_physics_2d.h b/main/tests/test_physics_2d.h
similarity index 100%
rename from bin/tests/test_physics_2d.h
rename to main/tests/test_physics_2d.h
diff --git a/bin/tests/test_python.cpp b/main/tests/test_python.cpp
similarity index 100%
rename from bin/tests/test_python.cpp
rename to main/tests/test_python.cpp
diff --git a/bin/tests/test_python.h b/main/tests/test_python.h
similarity index 100%
rename from bin/tests/test_python.h
rename to main/tests/test_python.h
diff --git a/bin/tests/test_render.cpp b/main/tests/test_render.cpp
similarity index 100%
rename from bin/tests/test_render.cpp
rename to main/tests/test_render.cpp
diff --git a/bin/tests/test_render.h b/main/tests/test_render.h
similarity index 100%
rename from bin/tests/test_render.h
rename to main/tests/test_render.h
diff --git a/bin/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp
similarity index 100%
rename from bin/tests/test_shader_lang.cpp
rename to main/tests/test_shader_lang.cpp
diff --git a/bin/tests/test_shader_lang.h b/main/tests/test_shader_lang.h
similarity index 100%
rename from bin/tests/test_shader_lang.h
rename to main/tests/test_shader_lang.h
diff --git a/bin/tests/test_sound.cpp b/main/tests/test_sound.cpp
similarity index 100%
rename from bin/tests/test_sound.cpp
rename to main/tests/test_sound.cpp
diff --git a/bin/tests/test_sound.h b/main/tests/test_sound.h
similarity index 100%
rename from bin/tests/test_sound.h
rename to main/tests/test_sound.h
diff --git a/bin/tests/test_string.cpp b/main/tests/test_string.cpp
similarity index 100%
rename from bin/tests/test_string.cpp
rename to main/tests/test_string.cpp
diff --git a/bin/tests/test_string.h b/main/tests/test_string.h
similarity index 100%
rename from bin/tests/test_string.h
rename to main/tests/test_string.h