diff --git a/test/tests/04_task_manager_test.rb b/spec/msf/core/task_manager_spec.rb
similarity index 100%
rename from test/tests/04_task_manager_test.rb
rename to spec/msf/core/task_manager_spec.rb
diff --git a/test/tests/02_nmap_import_test.rb b/spec/rex/parser/nmap_xml.rb
similarity index 100%
rename from test/tests/02_nmap_import_test.rb
rename to spec/rex/parser/nmap_xml.rb
diff --git a/test/tests/03_range_walker_test.rb b/spec/rex/socket/range_walker_spec.rb
similarity index 100%
rename from test/tests/03_range_walker_test.rb
rename to spec/rex/socket/range_walker_spec.rb