diff --git a/lib/jasmine/config.rb b/lib/jasmine/config.rb
index 0f2bc5a..846a6c0 100644
--- a/lib/jasmine/config.rb
+++ b/lib/jasmine/config.rb
@@ -5,9 +5,8 @@ module Jasmine
     def initialize(options = {})
       require 'selenium_rc'
       @selenium_jar_path = SeleniumRC::Server.allocate.jar_path
-      @options = options
 
-      @browser = options[:browser] ? options.delete(:browser) : 'firefox'
+      @browser = ENV["JASMINE_BROWSER"] || 'firefox'
       @selenium_pid = nil
       @jasmine_server_pid = nil
     end
diff --git a/spec/config_spec.rb b/spec/config_spec.rb
index 400644b..3e6a9a9 100644
--- a/spec/config_spec.rb
+++ b/spec/config_spec.rb
@@ -1,113 +1,144 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe Jasmine::Config do
-  before(:each) do
-    @template_dir = File.expand_path(File.join(File.dirname(__FILE__), "../generators/jasmine/templates"))
-    @config = Jasmine::Config.new
-  end
 
   describe "configuration" do
+
     before(:each) do
-      @config.stub!(:src_dir).and_return(File.join(@template_dir, "public"))
-      @config.stub!(:spec_dir).and_return(File.join(@template_dir, "spec"))
+      @template_dir = File.expand_path(File.join(File.dirname(__FILE__), "../generators/jasmine/templates"))
+      @config = Jasmine::Config.new
     end
 
-    it "if sources.yaml not found" do
-      File.stub!(:exist?).and_return(false)
-      @config.src_files.should == []
-      @config.stylesheets.should == []
-      @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
-      @config.mappings.should == {
-        '/__root__' => @config.project_root,
-        '/__spec__' => @config.spec_dir
-      }
-    end
+    describe "defaults" do
 
-    it "if jasmine.yml is empty" do
-      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
-      YAML.stub!(:load).and_return(false)
-      @config.src_files.should == []
-      @config.stylesheets.should == []
-      @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
-      @config.mappings.should == {
-        '/__root__' => @config.project_root,
-        '/__spec__' => @config.spec_dir
-      }
-    end
-
-    it "using default jasmine.yml" do
-      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
-      @config.src_files.should == []
-      @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
-      @config.mappings.should == {
-        '/__root__' => @config.project_root,
-        '/__spec__' => @config.spec_dir
-      }
-    end
-
-    it "simple_config stylesheets" do
-      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
-      YAML.stub!(:load).and_return({'stylesheets' => ['foo.css', 'bar.css']})
-      Dir.stub!(:glob).and_return do |glob_string|
-        glob_string
+      it "src_dir uses root when src dir is blank" do
+        @config.stub!(:project_root).and_return('some_project_root')
+        @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
+        YAML.stub!(:load).and_return({'src_dir' => nil})
+        @config.src_dir.should == 'some_project_root'
+      end
+
+      it "should use correct default yaml config" do
+        @config.stub!(:project_root).and_return('some_project_root')
+        @config.simple_config_file.should == (File.join('some_project_root', 'spec/javascripts/support/jasmine.yml'))
+      end
+
+
+      it "should provide dir mappings" do
+        @config.mappings.should == {
+          '/__root__' => @config.project_root,
+          '/__spec__' => @config.spec_dir
+        }
       end
-      @config.stylesheets.should == ['foo.css', 'bar.css']
     end
 
-    it "using rails jasmine.yml" do
-      original_glob = Dir.method(:glob)
-      Dir.stub!(:glob).and_return do |glob_string|
-        if glob_string =~ /public/
+
+    describe "simple_config" do
+      before(:each) do
+        @config.stub!(:src_dir).and_return(File.join(@template_dir, "public"))
+        @config.stub!(:spec_dir).and_return(File.join(@template_dir, "spec"))
+      end
+
+      it "if sources.yaml not found" do
+        File.stub!(:exist?).and_return(false)
+        @config.src_files.should == []
+        @config.stylesheets.should == []
+        @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
+        @config.mappings.should == {
+          '/__root__' => @config.project_root,
+          '/__spec__' => @config.spec_dir
+        }
+      end
+
+      it "if jasmine.yml is empty" do
+        @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
+        YAML.stub!(:load).and_return(false)
+        @config.src_files.should == []
+        @config.stylesheets.should == []
+        @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
+        @config.mappings.should == {
+          '/__root__' => @config.project_root,
+          '/__spec__' => @config.spec_dir
+        }
+      end
+
+      it "using default jasmine.yml" do
+        @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
+        @config.src_files.should == []
+        @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
+        @config.mappings.should == {
+          '/__root__' => @config.project_root,
+          '/__spec__' => @config.spec_dir
+        }
+      end
+
+      it "simple_config stylesheets" do
+        @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
+        YAML.stub!(:load).and_return({'stylesheets' => ['foo.css', 'bar.css']})
+        Dir.stub!(:glob).and_return do |glob_string|
           glob_string
-        else
-          original_glob.call(glob_string)
         end
+        @config.stylesheets.should == ['foo.css', 'bar.css']
+      end
+
+      it "using rails jasmine.yml" do
+        original_glob = Dir.method(:glob)
+        Dir.stub!(:glob).and_return do |glob_string|
+          if glob_string =~ /public/
+            glob_string
+          else
+            original_glob.call(glob_string)
+          end
+        end
+        @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine-rails.yml'))
+        @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
+        @config.src_files.should == ['javascripts/prototype.js',
+                                     'javascripts/effects.js',
+                                     'javascripts/controls.js',
+                                     'javascripts/dragdrop.js',
+                                     'javascripts/application.js']
+        @config.js_files.should == [
+          '/javascripts/prototype.js',
+          '/javascripts/effects.js',
+          '/javascripts/controls.js',
+          '/javascripts/dragdrop.js',
+          '/javascripts/application.js',
+          '/__spec__/javascripts/ExampleSpec.js',
+          '/__spec__/javascripts/SpecHelper.js',
+        ]
+      end
+
+      it "should provide a list of all spec files with full paths" do
+        @config.spec_files_full_paths.should == [
+          File.join(@template_dir, 'spec/javascripts/ExampleSpec.js'),
+          File.join(@template_dir, 'spec/javascripts/SpecHelper.js')
+        ]
       end
-      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine-rails.yml'))
-      @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
-      @config.src_files.should == ['javascripts/prototype.js',
-                                   'javascripts/effects.js',
-                                   'javascripts/controls.js',
-                                   'javascripts/dragdrop.js',
-                                   'javascripts/application.js']
-      @config.js_files.should == [
-        '/javascripts/prototype.js',
-        '/javascripts/effects.js',
-        '/javascripts/controls.js',
-        '/javascripts/dragdrop.js',
-        '/javascripts/application.js',
-        '/__spec__/javascripts/ExampleSpec.js',
-        '/__spec__/javascripts/SpecHelper.js',
-      ]
-    end
 
-    it "should provide a list of all spec files with full paths" do
-      @config.spec_files_full_paths.should == [
-        File.join(@template_dir, 'spec/javascripts/ExampleSpec.js'),
-        File.join(@template_dir, 'spec/javascripts/SpecHelper.js')
-      ]
     end
 
   end
 
-  it "src_dir uses root when src dir is blank" do
-    @config.stub!(:project_root).and_return('some_project_root')
-    @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
-    YAML.stub!(:load).and_return({'src_dir' => nil})
-    @config.src_dir.should == 'some_project_root'
-  end
+  describe "browsers" do
+    it "should use firefox by default" do
+      ENV.should_receive(:[], "JASMINE_BROWSER").and_return(nil)
+      config = Jasmine::Config.new
+      config.stub!(:start_servers)
+      Jasmine::SeleniumDriver.should_receive(:new).
+        with(anything(), anything(), "*firefox", anything()).
+        and_return(mock(Jasmine::SeleniumDriver, :connect => true))
+      config.start
+      end
 
-  it "should use correct default yaml config" do
-    @config.stub!(:project_root).and_return('some_project_root')
-    @config.simple_config_file.should == (File.join('some_project_root', 'spec/javascripts/support/jasmine.yml'))
-  end
-
-
-  it "should provide dir mappings" do
-    @config.mappings.should == {
-      '/__root__' => @config.project_root,
-      '/__spec__' => @config.spec_dir
-    }
+    it "should use ENV['JASMINE_BROWSER'] if set" do
+      ENV.should_receive(:[], "JASMINE_BROWSER").and_return("mosaic")
+      config = Jasmine::Config.new
+      config.stub!(:start_servers)
+      Jasmine::SeleniumDriver.should_receive(:new).
+        with(anything(), anything(), "*mosaic", anything()).
+        and_return(mock(Jasmine::SeleniumDriver, :connect => true))
+      config.start
+    end
   end
 
 end