diff --git a/test/parser/test_all.rb b/test/parser/test_all.rb
new file mode 100644
index 00000000..e2882bf0
--- /dev/null
+++ b/test/parser/test_all.rb
@@ -0,0 +1,7 @@
+
+require_relative "test_basic.rb"
+require_relative "test_arguments.rb"
+require_relative "test_expressions.rb"
+require_relative "test_function_call.rb"
+require_relative "test_conditional.rb"
+require_relative "test_function_definition.rb"
diff --git a/test/parser/test_conditional.rb b/test/parser/test_conditional.rb
index a9226f81..3699f2a1 100644
--- a/test/parser/test_conditional.rb
+++ b/test/parser/test_conditional.rb
@@ -1,6 +1,6 @@
 require_relative "helper"
 
-class TestBasic < MiniTest::Test
+class TestConditional < MiniTest::Test
   # include the magic (setup and parse -> test method translation), see there
   include ParserHelper
     
diff --git a/test/parser/test_expressions.rb b/test/parser/test_expressions.rb
index 21121683..b5a088d3 100644
--- a/test/parser/test_expressions.rb
+++ b/test/parser/test_expressions.rb
@@ -1,6 +1,6 @@
 require_relative "helper"
 
-class TestBasic < MiniTest::Test
+class TestExpressions < MiniTest::Test
   # include the magic (setup and parse -> test method translation), see there
   include ParserHelper
     
diff --git a/test/test_all.rb b/test/test_all.rb
index 368bbf21..be6f73a0 100644
--- a/test/test_all.rb
+++ b/test/test_all.rb
@@ -1,5 +1,4 @@
 require_relative "test_crystal"
-require_relative "test_ast"
-require_relative "test_parser"
 require_relative "test_small_program"
-require_relative "test_transform"
+#require_relative "test_runner"
+require_relative "parser/test_all"