diff --git a/test/cross-origin-good.html b/test/cross-origin-good.html
index 9c27d252..20fc970f 100644
--- a/test/cross-origin-good.html
+++ b/test/cross-origin-good.html
@@ -17,7 +17,7 @@
 <script>
 	window.MonacoEnvironment = {
 		getWorkerUrl: function() {
-			return loadDevEditor() ? 'cross-origin-worker-proxy-dev.js' : 'cross-origin-worker-proxy.js';
+			return 'cross-origin-worker-proxy.js#http://localhost:8088' + RESOLVED_CORE_PATH;
 		}
 	};
 </script>
diff --git a/test/cross-origin-worker-proxy-dev.js b/test/cross-origin-worker-proxy-dev.js
deleted file mode 100644
index 162d08c5..00000000
--- a/test/cross-origin-worker-proxy-dev.js
+++ /dev/null
@@ -1,4 +0,0 @@
-self.MonacoEnvironment = {
-	baseUrl: 'http://localhost:8088/vscode/out/'
-};
-importScripts('http://localhost:8088/vscode/out/vs/base/worker/workerMain.js');
\ No newline at end of file
diff --git a/test/cross-origin-worker-proxy.js b/test/cross-origin-worker-proxy.js
index d06f00a1..bfe1e44b 100644
--- a/test/cross-origin-worker-proxy.js
+++ b/test/cross-origin-worker-proxy.js
@@ -1,4 +1,10 @@
+var baseUrl = self.location.hash;
+baseUrl = baseUrl.replace(/^#/, '');
+baseUrl = baseUrl.replace(/vs$/, '');
+
+console.log('WORKER BASE_URL: ' + baseUrl);
+
 self.MonacoEnvironment = {
-	baseUrl: 'http://localhost:8088/monaco-editor/node_modules/monaco-editor-core/min/'
+	baseUrl: baseUrl
 };
-importScripts('http://localhost:8088/monaco-editor/node_modules/monaco-editor-core/min/vs/base/worker/workerMain.js');
\ No newline at end of file
+importScripts(baseUrl + 'vs/base/worker/workerMain.js');
\ No newline at end of file
diff --git a/test/dev-setup.js b/test/dev-setup.js
index 9a3b542c..dddc2cf7 100644
--- a/test/dev-setup.js
+++ b/test/dev-setup.js
@@ -42,10 +42,11 @@
 
 
 	var RESOLVED_CORE = new Component('editor', 'vs', METADATA.CORE.paths);
+	self.RESOLVED_CORE_PATH = RESOLVED_CORE.getResolvedPath();
 	var RESOLVED_PLUGINS = METADATA.PLUGINS.map(function(plugin) {
 		return new Component(plugin.name, plugin.modulePrefix, plugin.paths, plugin.contrib);
 	});
-	self.METADATA = null;
+	METADATA = null;
 
 
 	function loadScript(path, callback) {
@@ -58,14 +59,6 @@
 	}
 
 
-	self.loadDevEditor = function() {
-		return (getQueryStringValue('editor') === 'dev');
-	}
-	function getQueryStringValue (key) {
-		return unescape(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + escape(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
-	}
-
-
 	self.loadEditor = function(callback, PATH_PREFIX) {
 		PATH_PREFIX = PATH_PREFIX || '';