From 4cd0406d7e4b367c1e28b97d66b5205419c129bd Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 28 Feb 2017 15:10:58 -0500
Subject: [PATCH] reenable all tests

---
 test/generator/deconflict-builtins/_config.js | 2 --
 test/ssr.js                                   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/generator/deconflict-builtins/_config.js b/test/generator/deconflict-builtins/_config.js
index c24f95da90..14927e7ad3 100644
--- a/test/generator/deconflict-builtins/_config.js
+++ b/test/generator/deconflict-builtins/_config.js
@@ -1,6 +1,4 @@
 export default {
-	solo: true,
-
 	html: `<span>got</span>`,
 
 	test ( assert, component ) {
diff --git a/test/ssr.js b/test/ssr.js
index f98f1fb147..fa2873c810 100644
--- a/test/ssr.js
+++ b/test/ssr.js
@@ -12,7 +12,7 @@ function tryToReadFile ( file ) {
 	}
 }
 
-describe.skip( 'ssr', () => {
+describe( 'ssr', () => {
 	before( () => {
 		require( process.env.COVERAGE ?
 			'../src/server-side-rendering/register.js' :