diff --git a/spec/tools/cpassword_decrypt_spec.rb b/spec/tools/cpassword_decrypt_spec.rb
index a063c980b0..c7fbe94cbf 100644
--- a/spec/tools/cpassword_decrypt_spec.rb
+++ b/spec/tools/cpassword_decrypt_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-load Metasploit::Framework.root.join('tools/cpassword_decrypt.rb').to_path
+load Metasploit::Framework.root.join('tools/pentest/password/cpassword_decrypt.rb').to_path
 
 require 'msfenv'
 require 'msf/base'
diff --git a/spec/tools/egghunter_spec.rb b/spec/tools/egghunter_spec.rb
index 752f937db4..aa47d7a759 100644
--- a/spec/tools/egghunter_spec.rb
+++ b/spec/tools/egghunter_spec.rb
@@ -1,4 +1,4 @@
-load Metasploit::Framework.root.join('tools/egghunter.rb').to_path
+load Metasploit::Framework.root.join('tools/exploit_dev/egghunter.rb').to_path
 
 require 'stringio'
 
diff --git a/spec/tools/java_deserializer_spec.rb b/spec/tools/java_deserializer_spec.rb
index ada6d79415..17d146070d 100644
--- a/spec/tools/java_deserializer_spec.rb
+++ b/spec/tools/java_deserializer_spec.rb
@@ -1,7 +1,7 @@
 require 'rex/java'
 require 'stringio'
 
-load Metasploit::Framework.root.join('tools/java_deserializer.rb').to_path
+load Metasploit::Framework.root.join('tools/exploit_dev/java_deserializer.rb').to_path
 
 describe JavaDeserializer do
 
diff --git a/spec/tools/jsobfu_spec.rb b/spec/tools/jsobfu_spec.rb
index 5cfa463bd8..be9bc4867a 100644
--- a/spec/tools/jsobfu_spec.rb
+++ b/spec/tools/jsobfu_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-load Metasploit::Framework.root.join('tools/jsobfu.rb').to_path
+load Metasploit::Framework.root.join('tools/pentest/file/jsobfu.rb').to_path
 
 require 'stringio'
 
diff --git a/spec/tools/md5_lookup_spec.rb b/spec/tools/md5_lookup_spec.rb
index 3027304eca..940cba6f58 100644
--- a/spec/tools/md5_lookup_spec.rb
+++ b/spec/tools/md5_lookup_spec.rb
@@ -1,4 +1,4 @@
-load Metasploit::Framework.root.join('tools/md5_lookup.rb').to_path
+load Metasploit::Framework.root.join('tools/pentest/password/md5_lookup.rb').to_path
 
 require 'rex/proto/http/response'
 require 'stringio'
diff --git a/spec/tools/msu_finder_spec.rb b/spec/tools/msu_finder_spec.rb
index d85dce3d2c..28240c834c 100644
--- a/spec/tools/msu_finder_spec.rb
+++ b/spec/tools/msu_finder_spec.rb
@@ -1,4 +1,4 @@
-load Metasploit::Framework.root.join('tools/msu_finder.rb').to_path
+load Metasploit::Framework.root.join('tools/exploit_dev/msu_finder.rb').to_path
 
 require 'nokogiri'
 require 'uri'
diff --git a/spec/tools/virustotal_spec.rb b/spec/tools/virustotal_spec.rb
index a3250f3855..6b056a76cf 100644
--- a/spec/tools/virustotal_spec.rb
+++ b/spec/tools/virustotal_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-load Metasploit::Framework.root.join('tools/virustotal.rb').to_path
+load Metasploit::Framework.root.join('tools/pentest/file/virustotal.rb').to_path
 
 require 'msfenv'
 require 'msf/base'