diff --git a/test/risc/interpreter/test_assign_local.rb b/test/risc/interpreter/assign/test_assign_local.rb
similarity index 97%
rename from test/risc/interpreter/test_assign_local.rb
rename to test/risc/interpreter/assign/test_assign_local.rb
index 5d4c1da0..37a39ce4 100644
--- a/test/risc/interpreter/test_assign_local.rb
+++ b/test/risc/interpreter/assign/test_assign_local.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterAssignLocal < MiniTest::Test
diff --git a/test/risc/interpreter/test_assign_return.rb b/test/risc/interpreter/assign/test_assign_return.rb
similarity index 97%
rename from test/risc/interpreter/test_assign_return.rb
rename to test/risc/interpreter/assign/test_assign_return.rb
index d31300d3..6ea46b94 100644
--- a/test/risc/interpreter/test_assign_return.rb
+++ b/test/risc/interpreter/assign/test_assign_return.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterAssignReturn < MiniTest::Test
diff --git a/test/risc/interpreter/test_assign_thrice.rb b/test/risc/interpreter/assign/test_assign_thrice.rb
similarity index 98%
rename from test/risc/interpreter/test_assign_thrice.rb
rename to test/risc/interpreter/assign/test_assign_thrice.rb
index cadf21d2..677f6b3f 100644
--- a/test/risc/interpreter/test_assign_thrice.rb
+++ b/test/risc/interpreter/assign/test_assign_thrice.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterAssignThrice < MiniTest::Test
diff --git a/test/risc/interpreter/test_assign_twice.rb b/test/risc/interpreter/assign/test_assign_twice.rb
similarity index 97%
rename from test/risc/interpreter/test_assign_twice.rb
rename to test/risc/interpreter/assign/test_assign_twice.rb
index ae393826..94e37043 100644
--- a/test/risc/interpreter/test_assign_twice.rb
+++ b/test/risc/interpreter/assign/test_assign_twice.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterAssignTwice < MiniTest::Test
diff --git a/test/risc/interpreter/test_div10.rb b/test/risc/interpreter/calling/test_div10.rb
similarity index 98%
rename from test/risc/interpreter/test_div10.rb
rename to test/risc/interpreter/calling/test_div10.rb
index af166d83..15d373b8 100644
--- a/test/risc/interpreter/test_div10.rb
+++ b/test/risc/interpreter/calling/test_div10.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterDiv10 < MiniTest::Test
diff --git a/test/risc/interpreter/test_get_byte.rb b/test/risc/interpreter/calling/test_get_byte.rb
similarity index 98%
rename from test/risc/interpreter/test_get_byte.rb
rename to test/risc/interpreter/calling/test_get_byte.rb
index 2ab1c92c..c79df22d 100644
--- a/test/risc/interpreter/test_get_byte.rb
+++ b/test/risc/interpreter/calling/test_get_byte.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpretGetByte < MiniTest::Test
diff --git a/test/risc/interpreter/test_minus.rb b/test/risc/interpreter/calling/test_minus.rb
similarity index 98%
rename from test/risc/interpreter/test_minus.rb
rename to test/risc/interpreter/calling/test_minus.rb
index bda8c7a2..15a9d816 100644
--- a/test/risc/interpreter/test_minus.rb
+++ b/test/risc/interpreter/calling/test_minus.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterMinusTest < MiniTest::Test
diff --git a/test/risc/interpreter/test_mod.rb b/test/risc/interpreter/calling/test_mod.rb
similarity index 98%
rename from test/risc/interpreter/test_mod.rb
rename to test/risc/interpreter/calling/test_mod.rb
index 90e6f49a..4c33acb2 100644
--- a/test/risc/interpreter/test_mod.rb
+++ b/test/risc/interpreter/calling/test_mod.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterMod < MiniTest::Test
diff --git a/test/risc/interpreter/test_mult.rb b/test/risc/interpreter/calling/test_mult.rb
similarity index 98%
rename from test/risc/interpreter/test_mult.rb
rename to test/risc/interpreter/calling/test_mult.rb
index 07c38588..acfb7626 100644
--- a/test/risc/interpreter/test_mult.rb
+++ b/test/risc/interpreter/calling/test_mult.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterMultTest < MiniTest::Test
diff --git a/test/risc/interpreter/test_plus.rb b/test/risc/interpreter/calling/test_plus.rb
similarity index 99%
rename from test/risc/interpreter/test_plus.rb
rename to test/risc/interpreter/calling/test_plus.rb
index 3c742b5a..2c8d9754 100644
--- a/test/risc/interpreter/test_plus.rb
+++ b/test/risc/interpreter/calling/test_plus.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterPlusTest < MiniTest::Test
diff --git a/test/risc/interpreter/test_puts.rb b/test/risc/interpreter/calling/test_puts.rb
similarity index 98%
rename from test/risc/interpreter/test_puts.rb
rename to test/risc/interpreter/calling/test_puts.rb
index 205c3b42..75141019 100644
--- a/test/risc/interpreter/test_puts.rb
+++ b/test/risc/interpreter/calling/test_puts.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class TestPuts < MiniTest::Test
diff --git a/test/risc/interpreter/test_set_byte.rb b/test/risc/interpreter/calling/test_set_byte.rb
similarity index 98%
rename from test/risc/interpreter/test_set_byte.rb
rename to test/risc/interpreter/calling/test_set_byte.rb
index 79efda55..cabe1e0f 100644
--- a/test/risc/interpreter/test_set_byte.rb
+++ b/test/risc/interpreter/calling/test_set_byte.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpretSetByte < MiniTest::Test
diff --git a/test/risc/interpreter/test_simple_if10.rb b/test/risc/interpreter/conditional/test_simple_if10.rb
similarity index 97%
rename from test/risc/interpreter/test_simple_if10.rb
rename to test/risc/interpreter/conditional/test_simple_if10.rb
index 28e387c0..a5bbd520 100644
--- a/test/risc/interpreter/test_simple_if10.rb
+++ b/test/risc/interpreter/conditional/test_simple_if10.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterSimpleIf10 < MiniTest::Test
diff --git a/test/risc/interpreter/test_while_count.rb b/test/risc/interpreter/while/test_while_count.rb
similarity index 99%
rename from test/risc/interpreter/test_while_count.rb
rename to test/risc/interpreter/while/test_while_count.rb
index 1f99bdc2..af72fab2 100644
--- a/test/risc/interpreter/test_while_count.rb
+++ b/test/risc/interpreter/while/test_while_count.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterWhileCount < MiniTest::Test
diff --git a/test/risc/interpreter/test_while_simple.rb b/test/risc/interpreter/while/test_while_simple.rb
similarity index 98%
rename from test/risc/interpreter/test_while_simple.rb
rename to test/risc/interpreter/while/test_while_simple.rb
index 0aac3cfe..759bc21c 100644
--- a/test/risc/interpreter/test_while_simple.rb
+++ b/test/risc/interpreter/while/test_while_simple.rb
@@ -1,4 +1,4 @@
-require_relative "helper"
+require_relative "../helper"
 
 module Risc
   class InterpreterWhileSimle < MiniTest::Test