diff --git a/test/test.html b/test/test.html
index 5279862..756bd5d 100644
--- a/test/test.html
+++ b/test/test.html
@@ -2,12 +2,24 @@
 <script src="jspm_packages/system@0.4.1.js"></script>
 <script src="config.js"></script>
 
-<body><div id="mocha"></div></body>
+<body>
+  <div id="mocha"></div>
+  <div id="sandbox"></div>
+</body>
 
 <script>
   System.import('mocha').then(function(mocha) {
-    mocha.setup('tdd');
-    System.import('tests/tests').then(function() {
+    System.import('tests/tests').then(function(suites) {
+      mocha.setup('tdd');
+      for (var s in suites) {
+        suite(s, function() {
+          setup(function() {
+            document.querySelector("#sandbox").innerHTML = '';
+          });
+          for (var t in suites[s])
+            test(t, suites[s][t]);
+        });
+      }
       mocha.run();
     })
     .catch(function(e) {
diff --git a/test/tests/angular.js b/test/tests/angular.js
index a013e0e..71f3854 100644
--- a/test/tests/angular.js
+++ b/test/tests/angular.js
@@ -1,7 +1,14 @@
-suite('Angular', function() {
-  test('load', function(done) {
-    System.import('angular').then(function() {
-      done();
-    });
+
+exports['load test'] = function(done) {
+  System.import('angular').then(function() {
+    done();
   });
-});
\ No newline at end of file
+}
+
+exports['another test'] = function(done) {
+  System.import('angular').then(function(angular) {
+    if (!angular)
+      throw 'Test failed...';
+    done();
+  });
+}
\ No newline at end of file
diff --git a/test/tests/tests.js b/test/tests/tests.js
index 2fa251f..0b123bd 100644
--- a/test/tests/tests.js
+++ b/test/tests/tests.js
@@ -1,3 +1,2 @@
-suite('Angular', function() {
-  require('tests/angular');
-});
\ No newline at end of file
+
+  exports['Angular'] = require('tests/angular');
