diff --git a/spec/lib/msf/jmx/discovery_spec.rb b/spec/lib/msf/java/jmx/discovery_spec.rb
similarity index 100%
rename from spec/lib/msf/jmx/discovery_spec.rb
rename to spec/lib/msf/java/jmx/discovery_spec.rb
diff --git a/spec/lib/msf/jmx/handshake_spec.rb b/spec/lib/msf/java/jmx/handshake_spec.rb
similarity index 100%
rename from spec/lib/msf/jmx/handshake_spec.rb
rename to spec/lib/msf/java/jmx/handshake_spec.rb
diff --git a/spec/lib/msf/jmx/mbean/server_connection_spec.rb b/spec/lib/msf/java/jmx/mbean/server_connection_spec.rb
similarity index 100%
rename from spec/lib/msf/jmx/mbean/server_connection_spec.rb
rename to spec/lib/msf/java/jmx/mbean/server_connection_spec.rb
diff --git a/spec/lib/msf/jmx/util_spec.rb b/spec/lib/msf/java/jmx/util_spec.rb
similarity index 100%
rename from spec/lib/msf/jmx/util_spec.rb
rename to spec/lib/msf/java/jmx/util_spec.rb
diff --git a/spec/lib/msf/rmi/client/streams_spec.rb b/spec/lib/msf/java/rmi/client/streams_spec.rb
similarity index 100%
rename from spec/lib/msf/rmi/client/streams_spec.rb
rename to spec/lib/msf/java/rmi/client/streams_spec.rb
diff --git a/spec/lib/msf/rmi/client_spec.rb b/spec/lib/msf/java/rmi/client_spec.rb
similarity index 100%
rename from spec/lib/msf/rmi/client_spec.rb
rename to spec/lib/msf/java/rmi/client_spec.rb