diff --git a/stash/soml/fragments/test_all.rb b/stash/soml/fragments/test_all.rb
deleted file mode 100644
index dc71ced6..00000000
--- a/stash/soml/fragments/test_all.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-
-require_relative "test_if"
-require_relative "test_class"
-require_relative "test_functions"
-require_relative "test_hello"
-require_relative "test_if"
-require_relative "test_putint"
-require_relative "test_recursive_fibo"
-require_relative "test_return"
-require_relative "test_while_fibo"
-require_relative "test_word"
diff --git a/stash/soml/parfait/test_all.rb b/stash/soml/parfait/test_all.rb
deleted file mode 100644
index 2f3369ac..00000000
--- a/stash/soml/parfait/test_all.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require_relative "test_integer"
-require_relative "test_type"
-require_relative "test_word"
diff --git a/stash/soml/test_all.rb b/stash/soml/test_all.rb
deleted file mode 100644
index 7ebaf9dd..00000000
--- a/stash/soml/test_all.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_relative "expressions/test_all"
-
-require_relative "statements/test_all"
-
-require_relative "fragments/test_all"
-
-require_relative "parfait/test_all"
diff --git a/test/arm/test_all.rb b/test/arm/test_all.rb
deleted file mode 100644
index 9c0537fd..00000000
--- a/test/arm/test_all.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require_relative "test_call"
-require_relative "test_compare"
-require_relative "test_logic"
-require_relative "test_memory"
-require_relative "test_move"
-require_relative "test_stack"
diff --git a/test/elf/test_all.rb b/test/elf/test_all.rb
deleted file mode 100644
index a76fcf75..00000000
--- a/test/elf/test_all.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require_relative "test_hello"
-require_relative "test_zero"
diff --git a/test/lib/test_all.rb b/test/lib/test_all.rb
deleted file mode 100644
index 4eb0fba0..00000000
--- a/test/lib/test_all.rb
+++ /dev/null
@@ -1 +0,0 @@
-require_relative "test_log"
diff --git a/test/mom/test_all.rb b/test/mom/test_all.rb
deleted file mode 100644
index 17ef6964..00000000
--- a/test/mom/test_all.rb
+++ /dev/null
@@ -1 +0,0 @@
-require_relative "test_instruction"
diff --git a/test/parfait/test_all.rb b/test/parfait/test_all.rb
deleted file mode 100644
index 5d9e88fd..00000000
--- a/test/parfait/test_all.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_relative "test_attributes"
-require_relative "test_class"
-require_relative "test_dictionary"
-require_relative "test_list"
-require_relative "test_message"
-require_relative "test_named_list"
-require_relative "test_object"
-require_relative "test_space"
-require_relative "test_typed_method"
-require_relative "test_word"
diff --git a/test/risc/interpreter/test_all.rb b/test/risc/interpreter/test_all.rb
deleted file mode 100644
index ea08fe74..00000000
--- a/test/risc/interpreter/test_all.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require_relative "test_add"
-require_relative "test_byte_to_reg"
-require_relative "test_called_if"
-require_relative "test_change"
-require_relative "test_mult"
-require_relative "test_plus"
-require_relative "test_puts"
-require_relative "test_reg_to_byte"
-require_relative "test_simple_if"
diff --git a/test/risc/test_all.rb b/test/risc/test_all.rb
deleted file mode 100644
index dbc19b9e..00000000
--- a/test/risc/test_all.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require_relative "interpreter/test_all"
-
-require_relative "test_assembler"
-require_relative "test_collector"
-require_relative "test_compat"
-require_relative "test_instructions"
-require_relative "test_machine"
-require_relative "test_padding"
-require_relative "test_positioned"
diff --git a/test/rubyx/fragments/test_all.rb b/test/rubyx/fragments/test_all.rb
deleted file mode 100644
index 5005ce52..00000000
--- a/test/rubyx/fragments/test_all.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_relative "test_adds"
-require_relative "test_calls"
-require_relative "test_hello"
-require_relative "test_itos"
-require_relative "test_loop"
-
-require_relative "test_many_adds"
-require_relative "test_many_hello"
-require_relative "test_many_calls"
-require_relative "test_many_itos"
diff --git a/test/rubyx/passes/test_all.rb b/test/rubyx/passes/test_all.rb
deleted file mode 100644
index b20d9efd..00000000
--- a/test/rubyx/passes/test_all.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require_relative "test_locals_collector"
-require_relative "test_method_collector"
-require_relative "test_normalizer"
-require_relative "test_type_collector"
diff --git a/test/rubyx/test_all.rb b/test/rubyx/test_all.rb
deleted file mode 100644
index d614f0aa..00000000
--- a/test/rubyx/test_all.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require_relative "fragments/test_all"
-require_relative "passes/test_all"
-require_relative "test_ruby_method"
-require_relative "test_ruby_compiler"
diff --git a/test/test_all.rb b/test/test_all.rb
index a925afdc..f9b5593f 100644
--- a/test/test_all.rb
+++ b/test/test_all.rb
@@ -1,15 +1,4 @@
-require_relative "arm/test_all"
-
-require_relative "elf/test_all"
-
-require_relative "lib/test_all"
-
-require_relative "parfait/test_all"
-
-require_relative "risc/test_all"
-
-require_relative "rubyx/test_all"
-
-require_relative "vm/test_all"
-
-require_relative "vool/test_all"
+Dir["**/test_*.rb"].each { |f|
+  next if f.include?("stash/")
+  require_relative "../#{f}"
+}
diff --git a/test/vm/method_compiler/test_all.rb b/test/vm/method_compiler/test_all.rb
deleted file mode 100644
index a1baf0cf..00000000
--- a/test/vm/method_compiler/test_all.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#statements
-require_relative "test_assignment"
-require_relative "test_call_site"
-require_relative "test_fields"
-require_relative "test_if_statement"
-require_relative "test_return_statement"
-require_relative "test_while_statement"
-#expressions
-require_relative "test_basic_values"
-require_relative "test_field_access"
-require_relative "test_operator_expression"
-require_relative "test_name_expression"
diff --git a/test/vm/test_all.rb b/test/vm/test_all.rb
deleted file mode 100644
index 1f7995ac..00000000
--- a/test/vm/test_all.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative "type/test_all"
-
-require_relative "method_compiler/test_all"
-
-require_relative "test_to_code"
diff --git a/test/vm/type/test_all.rb b/test/vm/type/test_all.rb
deleted file mode 100644
index f2329aa9..00000000
--- a/test/vm/type/test_all.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative "test_basic"
-require_relative "test_hash"
-require_relative "test_message"
-require_relative "test_method_api"
-require_relative "test_type_api"
diff --git a/test/vool/compilers/test_all.rb b/test/vool/compilers/test_all.rb
deleted file mode 100644
index 7b6ab56d..00000000
--- a/test/vool/compilers/test_all.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_relative "helper"
-require_relative "test_ivar_collect"
-require_relative "test_local_collect"
-require_relative "test_class_compiler"
-require_relative "test_method_compiler"
diff --git a/test/vool/statements/test_all.rb b/test/vool/statements/test_all.rb
deleted file mode 100644
index 9f20a1e2..00000000
--- a/test/vool/statements/test_all.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require_relative "test_array_statement"
-require_relative "test_basic_values"
-require_relative "test_class_statement"
-require_relative "test_hash_statement"
-require_relative "test_if_statement"
-require_relative "test_ivar"
-require_relative "test_logical_statement"
-require_relative "test_method_statement"
-require_relative "test_return_statement"
-require_relative "test_send_statement"
-require_relative "test_variables"
-require_relative "test_while_statement"
diff --git a/test/vool/test_all.rb b/test/vool/test_all.rb
deleted file mode 100644
index 5413887f..00000000
--- a/test/vool/test_all.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require_relative "helper"
-require_relative "statements/test_all"
-require_relative "compilers/test_all"
-require_relative "to_mom/test_all"
diff --git a/test/vool/to_mom/test_all.rb b/test/vool/to_mom/test_all.rb
deleted file mode 100644
index 048d648a..00000000
--- a/test/vool/to_mom/test_all.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require_relative "helper"
-require_relative "test_local"
-require_relative "test_ivar"
-require_relative "test_args"