diff --git a/SConstruct b/SConstruct
index 45d8b102066..a1af7630311 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 
 EnsureSConsVersion(0, 14)
@@ -347,7 +348,7 @@ if selected_platform in platform_list:
 
     if (env['verbose'] == 'no'):
         methods.no_verbose(sys, env)
-        
+
     if (True): # FIXME: detect GLES3
         env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
 
@@ -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/core/SCsub b/core/SCsub
index 8d89f6427bb..7e30cfa1462 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -61,6 +61,7 @@ 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/bin/tests/SCsub b/core/tests/SCsub
similarity index 100%
rename from bin/tests/SCsub
rename to core/tests/SCsub
diff --git a/bin/tests/test_containers.cpp b/core/tests/test_containers.cpp
similarity index 100%
rename from bin/tests/test_containers.cpp
rename to core/tests/test_containers.cpp
diff --git a/bin/tests/test_containers.h b/core/tests/test_containers.h
similarity index 100%
rename from bin/tests/test_containers.h
rename to core/tests/test_containers.h
diff --git a/bin/tests/test_gdscript.cpp b/core/tests/test_gdscript.cpp
similarity index 100%
rename from bin/tests/test_gdscript.cpp
rename to core/tests/test_gdscript.cpp
diff --git a/bin/tests/test_gdscript.h b/core/tests/test_gdscript.h
similarity index 100%
rename from bin/tests/test_gdscript.h
rename to core/tests/test_gdscript.h
diff --git a/bin/tests/test_gui.cpp b/core/tests/test_gui.cpp
similarity index 100%
rename from bin/tests/test_gui.cpp
rename to core/tests/test_gui.cpp
diff --git a/bin/tests/test_gui.h b/core/tests/test_gui.h
similarity index 100%
rename from bin/tests/test_gui.h
rename to core/tests/test_gui.h
diff --git a/bin/tests/test_image.cpp b/core/tests/test_image.cpp
similarity index 100%
rename from bin/tests/test_image.cpp
rename to core/tests/test_image.cpp
diff --git a/bin/tests/test_image.h b/core/tests/test_image.h
similarity index 100%
rename from bin/tests/test_image.h
rename to core/tests/test_image.h
diff --git a/bin/tests/test_io.cpp b/core/tests/test_io.cpp
similarity index 100%
rename from bin/tests/test_io.cpp
rename to core/tests/test_io.cpp
diff --git a/bin/tests/test_io.h b/core/tests/test_io.h
similarity index 100%
rename from bin/tests/test_io.h
rename to core/tests/test_io.h
diff --git a/bin/tests/test_main.cpp b/core/tests/test_main.cpp
similarity index 100%
rename from bin/tests/test_main.cpp
rename to core/tests/test_main.cpp
diff --git a/bin/tests/test_main.h b/core/tests/test_main.h
similarity index 100%
rename from bin/tests/test_main.h
rename to core/tests/test_main.h
diff --git a/bin/tests/test_math.cpp b/core/tests/test_math.cpp
similarity index 100%
rename from bin/tests/test_math.cpp
rename to core/tests/test_math.cpp
diff --git a/bin/tests/test_math.h b/core/tests/test_math.h
similarity index 100%
rename from bin/tests/test_math.h
rename to core/tests/test_math.h
diff --git a/bin/tests/test_physics.cpp b/core/tests/test_physics.cpp
similarity index 100%
rename from bin/tests/test_physics.cpp
rename to core/tests/test_physics.cpp
diff --git a/bin/tests/test_physics.h b/core/tests/test_physics.h
similarity index 100%
rename from bin/tests/test_physics.h
rename to core/tests/test_physics.h
diff --git a/bin/tests/test_physics_2d.cpp b/core/tests/test_physics_2d.cpp
similarity index 100%
rename from bin/tests/test_physics_2d.cpp
rename to core/tests/test_physics_2d.cpp
diff --git a/bin/tests/test_physics_2d.h b/core/tests/test_physics_2d.h
similarity index 100%
rename from bin/tests/test_physics_2d.h
rename to core/tests/test_physics_2d.h
diff --git a/bin/tests/test_render.cpp b/core/tests/test_render.cpp
similarity index 100%
rename from bin/tests/test_render.cpp
rename to core/tests/test_render.cpp
diff --git a/bin/tests/test_render.h b/core/tests/test_render.h
similarity index 100%
rename from bin/tests/test_render.h
rename to core/tests/test_render.h
diff --git a/bin/tests/test_shader_lang.cpp b/core/tests/test_shader_lang.cpp
similarity index 100%
rename from bin/tests/test_shader_lang.cpp
rename to core/tests/test_shader_lang.cpp
diff --git a/bin/tests/test_shader_lang.h b/core/tests/test_shader_lang.h
similarity index 100%
rename from bin/tests/test_shader_lang.h
rename to core/tests/test_shader_lang.h
diff --git a/bin/tests/test_sound.cpp b/core/tests/test_sound.cpp
similarity index 100%
rename from bin/tests/test_sound.cpp
rename to core/tests/test_sound.cpp
diff --git a/bin/tests/test_sound.h b/core/tests/test_sound.h
similarity index 100%
rename from bin/tests/test_sound.h
rename to core/tests/test_sound.h
diff --git a/bin/tests/test_string.cpp b/core/tests/test_string.cpp
similarity index 100%
rename from bin/tests/test_string.cpp
rename to core/tests/test_string.cpp
diff --git a/bin/tests/test_string.h b/core/tests/test_string.h
similarity index 100%
rename from bin/tests/test_string.h
rename to core/tests/test_string.h
diff --git a/main/main.cpp b/main/main.cpp
index 12995f2a14a..e3827b9ba6d 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 "core/tests/test_main.h"
 #include "os/dir_access.h"
 #include "core/io/ip.h"
 #include "scene/resources/packed_scene.h"