diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index 8dd0a3c5c8..1bbed24279 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -100,7 +100,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'redcarpet'
   # Needed for Microsoft patch finding tool (msu_finder)
   spec.add_runtime_dependency 'patch_finder'
-  # Required for msfdb_ws (Metasploit data base as a webservice)
+  # Required for Metasploit Web Services
   spec.add_runtime_dependency 'thin'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'warden'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 302d287c17..642d5f7dc5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -112,7 +112,7 @@ RSpec.configure do |config|
   if ENV['REMOTE_DB']
     require 'metasploit/framework/data_service/remote/managed_remote_data_service'
     opts = {}
-    opts[:process_name] = 'msfdb_ws'
+    opts[:process_name] = File.join('tools', 'dev', 'msfdb_ws')
     opts[:host] = 'localhost'
     opts[:port] = '8080'
 
diff --git a/msfdb_ws b/tools/dev/msfdb_ws
similarity index 95%
rename from msfdb_ws
rename to tools/dev/msfdb_ws
index 7ac81c5a39..67db1e5272 100755
--- a/msfdb_ws
+++ b/tools/dev/msfdb_ws
@@ -15,7 +15,7 @@ end
 
 def require_deps
   require 'pathname'
-  require Pathname.new(__FILE__).realpath.expand_path.parent.join('config', 'boot')
+  require Pathname.new(__FILE__).realpath.expand_path.parent.parent.parent.join('config', 'boot')
   require 'msf/core/web_services/http_db_manager_service'
 end