diff --git a/user_interfaces/tc.rb b/user_interfaces/tc.rb
new file mode 100755
index 0000000000..f637f487ed
--- /dev/null
+++ b/user_interfaces/tc.rb
@@ -0,0 +1,6 @@
+#!/usr/bin/ruby -I../Framework
+
+require 'test/unit/ui/console/testrunner'
+require 'Msf'
+
+Test::Unit::UI::Console::TestRunner.run(Msf::Test::FrameworkCoreTestSuite)
diff --git a/user_interfaces/test.rb b/user_interfaces/test.rb
index f6ad2f7f0e..b21bedc595 100755
--- a/user_interfaces/test.rb
+++ b/user_interfaces/test.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -I../Framework -I../Modules
 
 require 'Msf/Framework'
-require 'Encoders/Generic/IA32/JmpCallAdditive'
+require 'Encoders/IA32/JmpCallAdditive'
 require 'Nops/IA32/SingleByte'
 
 framework = Msf::Framework.new