diff --git a/test/runtime/index.js b/test/runtime/index.js
index d8660e67fd..64d7f3ae51 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -75,7 +75,7 @@ describe("runtime", () => {
 			compileOptions.accessors = 'accessors' in config ? config.accessors : true;
 
 			Object.keys(require.cache)
-				.filter(x => x.startsWith(cwd))
+				.filter(x => x.endsWith('.svelte'))
 				.forEach(file => {
 					delete require.cache[file];
 				});
diff --git a/test/runtime/samples/component-namespaced/_config.js b/test/runtime/samples/component-namespaced/_config.js
index e5f4c680da..b91795d6c8 100644
--- a/test/runtime/samples/component-namespaced/_config.js
+++ b/test/runtime/samples/component-namespaced/_config.js
@@ -1,3 +1,5 @@
+import * as path from 'path';
+
 export default {
 	props: {
 		a: 1
@@ -7,6 +9,10 @@ export default {
 		<p>foo 1</p>
 	`,
 
+	before_test() {
+		delete require.cache[path.resolve(__dirname, 'components.js')];
+	},
+
 	test({ assert, component, target }) {
 		component.a = 2;
 		assert.htmlEqual(target.innerHTML, `
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index 2806a1b5c2..9f67ee06e9 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -97,7 +97,7 @@ describe("ssr", () => {
 			const cwd = path.resolve("test/runtime/samples", dir);
 
 			Object.keys(require.cache)
-				.filter(x => x.startsWith(cwd))
+				.filter(x => x.endsWith('.svelte'))
 				.forEach(file => {
 					delete require.cache[file];
 				});