Merge branch 'master' of https://github.com/xxgreg/mustache
diff --git a/test/all.dart b/test/all.dart
new file mode 100644
index 0000000..d75c7cc
--- /dev/null
+++ b/test/all.dart
@@ -0,0 +1,7 @@
+import 'mustache_specs.dart' as specs;
+import 'mustache_test.dart' as test;
+
+main() {
+  specs.main();
+  test.main();
+}
diff --git a/test/mustache_specs.dart b/test/mustache_specs.dart
index 82a3ab8..a2287a7 100644
--- a/test/mustache_specs.dart
+++ b/test/mustache_specs.dart
@@ -26,7 +26,7 @@
 }
 
 defineTests () {
-  var specs_dir = new Directory('spec/specs');
+  var specs_dir = new Directory('test/spec/specs');
   specs_dir
     .listSync()
     .forEach((File f) {