diff --git a/test/compiler/code_checker.rb b/test/compiler/expressions/code_checker.rb
similarity index 100%
rename from test/compiler/code_checker.rb
rename to test/compiler/expressions/code_checker.rb
diff --git a/test/compiler/compiler_helper.rb b/test/compiler/expressions/compiler_helper.rb
similarity index 95%
rename from test/compiler/compiler_helper.rb
rename to test/compiler/expressions/compiler_helper.rb
index ab66c39e..50c1f204 100644
--- a/test/compiler/compiler_helper.rb
+++ b/test/compiler/expressions/compiler_helper.rb
@@ -1,4 +1,4 @@
-require_relative '../helper'
+require_relative '../../helper'
 require 'parslet/convenience'
 
 Phisol::Compiler.class_eval do
diff --git a/test/compiler/expressions/test_all.rb b/test/compiler/expressions/test_all.rb
new file mode 100644
index 00000000..933bcb16
--- /dev/null
+++ b/test/compiler/expressions/test_all.rb
@@ -0,0 +1,4 @@
+require_relative "test_basic"
+require_relative "test_call"
+require_relative "test_field_access"
+require_relative "test_function"
diff --git a/test/compiler/test_basic.rb b/test/compiler/expressions/test_basic.rb
similarity index 100%
rename from test/compiler/test_basic.rb
rename to test/compiler/expressions/test_basic.rb
diff --git a/test/compiler/test_call.rb b/test/compiler/expressions/test_call.rb
similarity index 100%
rename from test/compiler/test_call.rb
rename to test/compiler/expressions/test_call.rb
diff --git a/test/compiler/test_field_access.rb b/test/compiler/expressions/test_field_access.rb
similarity index 100%
rename from test/compiler/test_field_access.rb
rename to test/compiler/expressions/test_field_access.rb
diff --git a/test/compiler/test_function.rb b/test/compiler/expressions/test_function.rb
similarity index 100%
rename from test/compiler/test_function.rb
rename to test/compiler/expressions/test_function.rb
diff --git a/test/fragments/helper.rb b/test/compiler/fragments/helper.rb
similarity index 98%
rename from test/fragments/helper.rb
rename to test/compiler/fragments/helper.rb
index ecfbd6d0..0017bebb 100644
--- a/test/fragments/helper.rb
+++ b/test/compiler/fragments/helper.rb
@@ -1,4 +1,4 @@
-require_relative '../helper'
+require_relative '../../helper'
 
 # simple tests to check parsing pworks and the first classes come out right.
 #
diff --git a/test/fragments/test_all.rb b/test/compiler/fragments/test_all.rb
similarity index 100%
rename from test/fragments/test_all.rb
rename to test/compiler/fragments/test_all.rb
diff --git a/test/fragments/test_class.rb b/test/compiler/fragments/test_class.rb
similarity index 100%
rename from test/fragments/test_class.rb
rename to test/compiler/fragments/test_class.rb
diff --git a/test/fragments/test_foo.rb b/test/compiler/fragments/test_foo.rb
similarity index 100%
rename from test/fragments/test_foo.rb
rename to test/compiler/fragments/test_foo.rb
diff --git a/test/fragments/test_functions.rb b/test/compiler/fragments/test_functions.rb
similarity index 100%
rename from test/fragments/test_functions.rb
rename to test/compiler/fragments/test_functions.rb
diff --git a/test/fragments/test_hello.rb b/test/compiler/fragments/test_hello.rb
similarity index 100%
rename from test/fragments/test_hello.rb
rename to test/compiler/fragments/test_hello.rb
diff --git a/test/fragments/test_if.rb b/test/compiler/fragments/test_if.rb
similarity index 100%
rename from test/fragments/test_if.rb
rename to test/compiler/fragments/test_if.rb
diff --git a/test/fragments/test_methods.rb b/test/compiler/fragments/test_methods.rb
similarity index 100%
rename from test/fragments/test_methods.rb
rename to test/compiler/fragments/test_methods.rb
diff --git a/test/fragments/test_putint.rb b/test/compiler/fragments/test_putint.rb
similarity index 100%
rename from test/fragments/test_putint.rb
rename to test/compiler/fragments/test_putint.rb
diff --git a/test/fragments/test_recursive_fibo.rb b/test/compiler/fragments/test_recursive_fibo.rb
similarity index 100%
rename from test/fragments/test_recursive_fibo.rb
rename to test/compiler/fragments/test_recursive_fibo.rb
diff --git a/test/fragments/test_while_fibo.rb b/test/compiler/fragments/test_while_fibo.rb
similarity index 100%
rename from test/fragments/test_while_fibo.rb
rename to test/compiler/fragments/test_while_fibo.rb
diff --git a/test/compiler/statements/test_all.rb b/test/compiler/statements/test_all.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/test/compiler/test_all.rb b/test/compiler/test_all.rb
index 933bcb16..272825eb 100644
--- a/test/compiler/test_all.rb
+++ b/test/compiler/test_all.rb
@@ -1,4 +1,5 @@
-require_relative "test_basic"
-require_relative "test_call"
-require_relative "test_field_access"
-require_relative "test_function"
+require_relative "expressions/test_all"
+
+require_relative "statements/test_all"
+
+require_relative "fragments/test_all"
diff --git a/test/test_all.rb b/test/test_all.rb
index 603c1acb..28f3079b 100644
--- a/test/test_all.rb
+++ b/test/test_all.rb
@@ -4,8 +4,6 @@ require_relative "elf/test_all"
 
 require_relative "parfait/test_all"
 
-require_relative "fragments/test_all"
-
 require_relative "virtual/test_all"
 
 require_relative "interpreter/test_all"