diff --git a/config/cucumber.yml b/config/cucumber.yml
new file mode 100644
index 0000000..2e8d86f
--- /dev/null
+++ b/config/cucumber.yml
@@ -0,0 +1,2 @@
+default: --tags ~@selenium --exclude features/support/selenium.rb
+selenium: --tags @selenium
diff --git a/config/environments/cucumber.rb b/config/environments/cucumber.rb
index 90100ea..1e01586 100644
--- a/config/environments/cucumber.rb
+++ b/config/environments/cucumber.rb
@@ -23,4 +23,7 @@ config.gem 'cucumber',    :lib => false,        :version => '>=0.4.0' unless Fil
 config.gem 'webrat',      :lib => false,        :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
 config.gem 'rspec',       :lib => 'spec',        :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
 config.gem 'rspec-rails', :lib => 'spec/rails',        :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+config.gem 'Selenium',    :lib => 'selenium',      :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))
+config.gem 'selenium-client',    :lib => 'selenium/client',      :version => '>= 1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client'))
+config.gem 'bmabey-database_cleaner', :lib => 'database_cleaner', :source => 'http://gems.github.com/'
 
diff --git a/features/support/selenium.rb b/features/support/selenium.rb
new file mode 100644
index 0000000..5565935
--- /dev/null
+++ b/features/support/selenium.rb
@@ -0,0 +1,23 @@
+Webrat.configure do |config|
+  config.mode = :selenium
+end
+
+Cucumber::Rails::World.use_transactional_fixtures = false
+
+require 'database_cleaner'
+require 'database_cleaner/cucumber'
+
+DatabaseCleaner.clean_with :truncation
+DatabaseCleaner.strategy = :truncation
+
+Before do
+  Fixtures.reset_cache
+  fixtures_folder = File.join(RAILS_ROOT, 'test', 'fixtures')
+  fixtures = ['environments', 'roles']
+  Fixtures.create_fixtures(fixtures_folder, fixtures)
+  DatabaseCleaner.start
+end
+
+After do
+  DatabaseCleaner.clean
+end
--
libgit2 0.21.2