diff --git a/test/typed/statements/helper.rb b/test/typed/method_compiler/helper.rb
similarity index 100%
rename from test/typed/statements/helper.rb
rename to test/typed/method_compiler/helper.rb
diff --git a/test/typed/statements/test_all.rb b/test/typed/method_compiler/test_all.rb
similarity index 84%
rename from test/typed/statements/test_all.rb
rename to test/typed/method_compiler/test_all.rb
index 746cc339..632c2a7b 100644
--- a/test/typed/statements/test_all.rb
+++ b/test/typed/method_compiler/test_all.rb
@@ -1,5 +1,5 @@
 require_relative "test_assign"
-require_relative "test_call"
+require_relative "test_call_site"
 require_relative "test_class"
 require_relative "test_fields"
 require_relative "test_if"
diff --git a/test/typed/statements/test_assign.rb b/test/typed/method_compiler/test_assign.rb
similarity index 100%
rename from test/typed/statements/test_assign.rb
rename to test/typed/method_compiler/test_assign.rb
diff --git a/test/typed/statements/test_call.rb b/test/typed/method_compiler/test_call_site.rb
similarity index 100%
rename from test/typed/statements/test_call.rb
rename to test/typed/method_compiler/test_call_site.rb
diff --git a/test/typed/statements/test_class.rb b/test/typed/method_compiler/test_class.rb
similarity index 100%
rename from test/typed/statements/test_class.rb
rename to test/typed/method_compiler/test_class.rb
diff --git a/test/typed/statements/test_fields.rb b/test/typed/method_compiler/test_fields.rb
similarity index 100%
rename from test/typed/statements/test_fields.rb
rename to test/typed/method_compiler/test_fields.rb
diff --git a/test/typed/statements/test_if.rb b/test/typed/method_compiler/test_if.rb
similarity index 100%
rename from test/typed/statements/test_if.rb
rename to test/typed/method_compiler/test_if.rb
diff --git a/test/typed/statements/test_return.rb b/test/typed/method_compiler/test_return.rb
similarity index 100%
rename from test/typed/statements/test_return.rb
rename to test/typed/method_compiler/test_return.rb
diff --git a/test/typed/statements/test_while.rb b/test/typed/method_compiler/test_while.rb
similarity index 100%
rename from test/typed/statements/test_while.rb
rename to test/typed/method_compiler/test_while.rb
diff --git a/test/typed/test_all.rb b/test/typed/test_all.rb
index b405a29a..4eb9bdb3 100644
--- a/test/typed/test_all.rb
+++ b/test/typed/test_all.rb
@@ -4,6 +4,6 @@ require_relative "type/test_all"
 
 require_relative "expressions/test_all"
 
-require_relative "statements/test_all"
+require_relative "method_compiler/test_all"
 
 require_relative "test_to_code"