diff --git a/site/content/docs/02-template-syntax.md b/site/content/docs/02-template-syntax.md
index a69400f8e3..c6fd5c8b2d 100644
--- a/site/content/docs/02-template-syntax.md
+++ b/site/content/docs/02-template-syntax.md
@@ -7,7 +7,7 @@ title: Template syntax
 
 ---
 
-A lowercase tag, like `<div>`, denotes a regular HTML element. A capitalised tag, such as `<Widget>`, indicates a *component*.
+A lowercase tag, like `<div>`, denotes a regular HTML element. A capitalised tag, such as `<Widget>` or `<Namespace.Widget>`, indicates a *component*.
 
 ```html
 <script>
diff --git a/src/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compile/render-dom/wrappers/InlineComponent/index.ts
index c696f4813c..f9d79d2693 100644
--- a/src/compile/render-dom/wrappers/InlineComponent/index.ts
+++ b/src/compile/render-dom/wrappers/InlineComponent/index.ts
@@ -63,7 +63,7 @@ export default class InlineComponentWrapper extends Wrapper {
 		this.var = (
 			this.node.name === 'svelte:self' ? renderer.component.name :
 			this.node.name === 'svelte:component' ? 'switch_instance' :
-			this.node.name
+			sanitize(this.node.name)
 		).toLowerCase();
 
 		if (this.node.children.length) {
diff --git a/test/runtime/index.js b/test/runtime/index.js
index 579dc665c6..d8660e67fd 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.endsWith(".svelte"))
+				.filter(x => x.startsWith(cwd))
 				.forEach(file => {
 					delete require.cache[file];
 				});
diff --git a/test/runtime/samples/component-namespaced/Foo.svelte b/test/runtime/samples/component-namespaced/Foo.svelte
new file mode 100644
index 0000000000..67ab955233
--- /dev/null
+++ b/test/runtime/samples/component-namespaced/Foo.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let foo;
+</script>
+
+<p>foo {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-namespaced/_config.js b/test/runtime/samples/component-namespaced/_config.js
new file mode 100644
index 0000000000..e5f4c680da
--- /dev/null
+++ b/test/runtime/samples/component-namespaced/_config.js
@@ -0,0 +1,16 @@
+export default {
+	props: {
+		a: 1
+	},
+
+	html: `
+		<p>foo 1</p>
+	`,
+
+	test({ assert, component, target }) {
+		component.a = 2;
+		assert.htmlEqual(target.innerHTML, `
+			<p>foo 2</p>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/component-namespaced/components.js b/test/runtime/samples/component-namespaced/components.js
new file mode 100644
index 0000000000..832d2412ee
--- /dev/null
+++ b/test/runtime/samples/component-namespaced/components.js
@@ -0,0 +1,3 @@
+import Foo from './Foo.svelte';
+
+export default { Foo };
\ No newline at end of file
diff --git a/test/runtime/samples/component-namespaced/main.svelte b/test/runtime/samples/component-namespaced/main.svelte
new file mode 100644
index 0000000000..541b68e47e
--- /dev/null
+++ b/test/runtime/samples/component-namespaced/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	import Components from './components.js';
+
+	export let a;
+</script>
+
+<Components.Foo foo={a}/>
\ No newline at end of file
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index 6a546b0b7b..2806a1b5c2 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -96,10 +96,11 @@ describe("ssr", () => {
 		(config.skip ? it.skip : config.solo ? it.only : it)(dir, () => {
 			const cwd = path.resolve("test/runtime/samples", dir);
 
-			glob('**/*.svelte', { cwd: `test/runtime/samples/${dir}` }).forEach(file => {
-				const resolved = require.resolve(`../runtime/samples/${dir}/${file}`);
-				delete require.cache[resolved];
-			});
+			Object.keys(require.cache)
+				.filter(x => x.startsWith(cwd))
+				.forEach(file => {
+					delete require.cache[file];
+				});
 
 			const compileOptions = Object.assign({ sveltePath }, config.compileOptions, {
 				generate: 'ssr'