diff --git a/lib/webrat/core/configuration.rb b/lib/webrat/core/configuration.rb
index 1fb3d4c..bc9209e 100755
--- a/lib/webrat/core/configuration.rb
+++ b/lib/webrat/core/configuration.rb
@@ -64,7 +64,7 @@ module Webrat
       self.application_environment = :selenium
       self.application_port = 3001
       self.application_address = 'localhost'
-      self.application_type = 'rails'
+      self.application_framework = 'rails'
       self.selenium_server_port = 4444
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
diff --git a/lib/webrat/selenium.rb b/lib/webrat/selenium.rb
index 18f5e6b..caec6ab 100644
--- a/lib/webrat/selenium.rb
+++ b/lib/webrat/selenium.rb
@@ -41,7 +41,7 @@ module Webrat
         exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
       end
     when :merb
-      system("merb -d -p #{Webrat.configuration.application_port}"
+      system("merb -d -p #{Webrat.configuration.application_port}")
     else # rails
       system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
     end
diff --git a/spec/private/selenium/selenium_spec.rb b/spec/private/selenium/selenium_spec.rb
index e76a89a..e09ebe6 100644
--- a/spec/private/selenium/selenium_spec.rb
+++ b/spec/private/selenium/selenium_spec.rb
@@ -21,7 +21,7 @@ describe Webrat, "Selenium" do
     describe "merb" do
       it "should start the app server with correct config options" do
         Webrat.configuration.application_framework = :merb
-        Webrat.should_receive(:fork)
+        Webrat.should_receive(:system).with("merb -d -p #{Webrat.configuration.application_port}")
 #        Kernel.should_receive(:exec).with(['merb', '-d', '-p', Webrat.configuration.application_port])
         TCPSocket.should_receive(:wait_for_service).with(:host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i)
         Webrat.start_app_server