diff --git a/.gitignore b/.gitignore
index a1fcc11..3e68982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ tmp
 .blimpy.d
 .rvmrc
 Blimpyfile
+features/report.html
+features/reports
diff --git a/Rakefile b/Rakefile
index 13c75a7..db9f06f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,28 +9,28 @@ RSpec::Core::RakeTask.new('spec') do |t|
 end
 
 
+Cucumber::Rake::Task.new('cucumber')
+
 namespace :cucumber do
-  cucumber_opts = '--color --format progress --tags ~@wip'
-
-  Cucumber::Rake::Task.new('basic') do |t|
-    t.cucumber_opts = cucumber_opts + ' --tags ~@slow'
-  end
-
-  Cucumber::Rake::Task.new('integration') do |t|
-    t.cucumber_opts = cucumber_opts + ' --tags @slow --tags ~@openstack'
+  Cucumber::Rake::Task.new('aws') do |t|
+    t.cucumber_opts = '-p aws'
   end
 
   Cucumber::Rake::Task.new('openstack') do |t|
-    t.cucumber_opts = cucumber_opts + ' --tags @openstack'
+    t.cucumber_opts = '-p openstack'
+  end
+
+  Cucumber::Rake::Task.new('wip') do |t|
+    t.cucumber_opts = '-p wip'
   end
 end
 
 desc 'Run the basic test suite'
-task :test => [:spec, :"cucumber:basic"]
+task :test => ['spec', 'cucumber']
 
 namespace :test do
-  desc 'Run all the tests, including the slow integration tests'
-  task :all => [:spec, :'cucumber:basic', :'cucumber:integration']
+  desc 'Run all the tests, including the slow (AWS-based) integration tests'
+  task :all => ['spec', 'cucumber', 'cucumber:aws']
 end
 
 
diff --git a/cucumber.yml b/cucumber.yml
new file mode 100644
index 0000000..d8c38c9
--- /dev/null
+++ b/cucumber.yml
@@ -0,0 +1,7 @@
+<%
+opts = "--color --format progress --format junit --out features/reports --format html --out features/report.html"
+%>
+default: <%= opts %> --tags ~@wip --tags ~@slow
+aws: <%= opts %> --tags ~@wip --tags @slow --tags ~@openstack
+openstack: <%= opts %> --tags ~@wip --tags @openstack
+wip: <%= opts %> --tags @wip