diff --git a/cli/src/commands/wheels/test.cfc b/cli/src/commands/wheels/test.cfc
index 8b2a80a4e4..e4b6c14187 100644
--- a/cli/src/commands/wheels/test.cfc
+++ b/cli/src/commands/wheels/test.cfc
@@ -89,14 +89,12 @@ component extends="base" {
 	  		// Always force JSON as return format
 			if(loc.type eq 'app'){
 				loc.testurl = "http://" & loc.host & ":" & loc.port
-							   & "/" & "?controller=tests&action=runner&view=runner"
-							   & "&type=#loc.type#"
+							   & "/" & "?controller=wheels.public&action=testbox&view=runner"
 							   & "&format=#loc.format#"
 							   & "&reload=#loc.reload#";
 			} else if(loc.type eq 'core'){
 				loc.testurl = "http://" & loc.host & ":" & loc.port
-							   & "/" & "?controller=wheels.tests_testbox&action=runner&view=runner"
-							   & "&type=#loc.type#"
+							   & "/" & "?controller=wheels.public&action=tests_testbox&view=runner"
 							   & "&format=#loc.format#"
 							   & "&reload=#loc.reload#";
 			} else {
diff --git a/core/src/wheels/Public.cfc b/core/src/wheels/Public.cfc
index 05510179e0..7871ec2ad1 100644
--- a/core/src/wheels/Public.cfc
+++ b/core/src/wheels/Public.cfc
@@ -40,6 +40,10 @@ component output="false" displayName="Internal GUI" extends="wheels.Global" {
 		include "/wheels/public/views/runner.cfm";
 		return "";
 	}
+
+	function testbox(){
+		include "/tests/Testbox/runner.cfm";
+	}
 	
 	public function tests_testbox(){
 		// Set proper HTTP status first
diff --git a/core/src/wheels/events/onrequestend/debug.cfm b/core/src/wheels/events/onrequestend/debug.cfm
index 48335d1eaa..d6cb08111f 100644
--- a/core/src/wheels/events/onrequestend/debug.cfm
+++ b/core/src/wheels/events/onrequestend/debug.cfm
@@ -105,7 +105,7 @@
 						<a href="#urlFor(route = "wheelsGuides")#" class="btn" target="_blank">Guides</a>
 					</td>
 					<td>
-						<a href="#urlFor(route = "wheelsPackages", type = "app")#" class="btn" target="_blank">Tests</a>
+						<a href="#urlFor(route = "wheelstestbox")#" class="btn" target="_blank">Tests</a>
 					</td>
 					<cfif $get("enableMigratorComponent")>
 						<td>
diff --git a/core/src/wheels/public/layout/_navigation.cfm b/core/src/wheels/public/layout/_navigation.cfm
index 6b8336aa85..aec3317753 100644
--- a/core/src/wheels/public/layout/_navigation.cfm
+++ b/core/src/wheels/public/layout/_navigation.cfm
@@ -25,7 +25,7 @@
 				navArgs['type'] = item['type'];
 			</cfscript>
 			<cfif item.title eq "Tests">
-				<a href="/wheels/testbox" class="#navArgs['class']#">#navArgs.Text#</a>
+				<a href="#urlFor(route = "testbox")#" class="#navArgs['class']#">#navArgs.Text#</a>
 			<cfelse>
 				<a href="#urlFor(argumentCollection = navArgs)#" class="#navArgs['class']#">#navArgs.Text#</a>
 			</cfif>
diff --git a/core/src/wheels/public/routes.cfm b/core/src/wheels/public/routes.cfm
index c4046d1f48..886dadeab2 100644
--- a/core/src/wheels/public/routes.cfm
+++ b/core/src/wheels/public/routes.cfm
@@ -32,6 +32,6 @@ mapper()
 	.end()
 	// Add route for tests controller outside the wheels namespace
 	.get(name = "testsController", pattern = "tests", to = "tests##index")
-	.get(name = "testbox", pattern = "testbox", to = "tests##runner")
+	.get(name = "testbox", pattern = "testbox", to = "wheels##public##testbox")
 .end();
 </cfscript>
diff --git a/templates/base/src/app/views/tests/runner.cfm b/templates/base/src/app/views/tests/runner.cfm
deleted file mode 100644
index afb1fb2d8b..0000000000
--- a/templates/base/src/app/views/tests/runner.cfm
+++ /dev/null
@@ -1 +0,0 @@
-<cfinclude  template="../../../tests/testbox/runner.cfm">
\ No newline at end of file