20 files changed, 18 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml
index 5f77bb3bd7..324edcadc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,11 +29,11 @@ matrix:
     script: bundle exec rake pedant
     ### START TEST KITCHEN ONLY ###
   - rvm: 2.1.1
-    gemfile: spec/e2e/Gemfile
+    gemfile: kitchen-tests/Gemfile
     before_install:
     - echo -n $DO_KEY_CHUNK_{0..30} >> ~/.ssh/id_aws.base64
     - cat ~/.ssh/id_aws.base64 | tr -d ' ' | base64 --decode > ~/.ssh/id_aws.pem
-    before_script: cd spec/e2e
+    before_script: cd kitchen-tests
     script:
     - bundle exec kitchen test
     after_script:
diff --git a/spec/e2e/.chef/client.rb b/kitchen-tests/.chef/client.rb
index 5eb200a939..5eb200a939 100644
--- a/spec/e2e/.chef/client.rb
+++ b/kitchen-tests/.chef/client.rb
diff --git a/spec/e2e/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 6ea825fc12..6ea825fc12 100644
--- a/spec/e2e/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
diff --git a/spec/e2e/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 651a606502..651a606502 100644
--- a/spec/e2e/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
diff --git a/spec/e2e/Berksfile b/kitchen-tests/Berksfile
index 66569ed97f..66569ed97f 100644
--- a/spec/e2e/Berksfile
+++ b/kitchen-tests/Berksfile
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
new file mode 100644
index 0000000000..60df7ef388
--- /dev/null
+++ b/kitchen-tests/Gemfile
@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+group :end_to_end do
+  gem 'berkshelf'
+  # Once merged into test-kitchen/test-kitchen:master we can remove
+  # this and replace it with
+  # gem 'test-kitchen', :github => 'test-kitchen/test-kitchen'
+  # until the next test-kitchen gem release.
+  gem 'test-kitchen', :github => 'mcquin/test-kitchen',
+                      :branch => 'mcquin/install_chef_from_github'
+
+  gem 'kitchen-vagrant' # Used for local testing
+  gem 'kitchen-ec2'     # Used for remote (Travis) testing
+end
diff --git a/spec/e2e/README.md b/kitchen-tests/README.md
index e5b205c1b6..e5b205c1b6 100644
--- a/spec/e2e/README.md
+++ b/kitchen-tests/README.md
diff --git a/spec/e2e/cookbooks/webapp/Berksfile b/kitchen-tests/cookbooks/webapp/Berksfile
index 4b6079016e..4b6079016e 100644
--- a/spec/e2e/cookbooks/webapp/Berksfile
+++ b/kitchen-tests/cookbooks/webapp/Berksfile
diff --git a/spec/e2e/cookbooks/webapp/README.md b/kitchen-tests/cookbooks/webapp/README.md
index e8de6ee467..e8de6ee467 100644
--- a/spec/e2e/cookbooks/webapp/README.md
+++ b/kitchen-tests/cookbooks/webapp/README.md
diff --git a/spec/e2e/cookbooks/webapp/attributes/default.rb b/kitchen-tests/cookbooks/webapp/attributes/default.rb
index efe06b6549..efe06b6549 100644
--- a/spec/e2e/cookbooks/webapp/attributes/default.rb
+++ b/kitchen-tests/cookbooks/webapp/attributes/default.rb
diff --git a/spec/e2e/cookbooks/webapp/metadata.rb b/kitchen-tests/cookbooks/webapp/metadata.rb
index ecfb419953..ecfb419953 100644
--- a/spec/e2e/cookbooks/webapp/metadata.rb
+++ b/kitchen-tests/cookbooks/webapp/metadata.rb
diff --git a/spec/e2e/cookbooks/webapp/recipes/default.rb b/kitchen-tests/cookbooks/webapp/recipes/default.rb
index 531dde240d..82479e5137 100644
--- a/spec/e2e/cookbooks/webapp/recipes/default.rb
+++ b/kitchen-tests/cookbooks/webapp/recipes/default.rb
@@ -6,8 +6,6 @@
 #
 
 include_recipe "apache2"
-# include_recipe "mysql::client"
-# include_recipe "mysql::server"
 include_recipe "database::mysql"
 include_recipe "php"
 
diff --git a/spec/e2e/cookbooks/webapp/templates/default/index.html.erb b/kitchen-tests/cookbooks/webapp/templates/default/index.html.erb
index 6da0629b9e..6da0629b9e 100644
--- a/spec/e2e/cookbooks/webapp/templates/default/index.html.erb
+++ b/kitchen-tests/cookbooks/webapp/templates/default/index.html.erb
diff --git a/spec/e2e/cookbooks/webapp/templates/default/index.php.erb b/kitchen-tests/cookbooks/webapp/templates/default/index.php.erb
index b08b076614..b08b076614 100644
--- a/spec/e2e/cookbooks/webapp/templates/default/index.php.erb
+++ b/kitchen-tests/cookbooks/webapp/templates/default/index.php.erb
diff --git a/spec/e2e/data_bags/passwords/mysql.json b/kitchen-tests/data_bags/passwords/mysql.json
index af02a6a858..af02a6a858 100644
--- a/spec/e2e/data_bags/passwords/mysql.json
+++ b/kitchen-tests/data_bags/passwords/mysql.json
diff --git a/spec/e2e/data_bags/passwords/webapp.json b/kitchen-tests/data_bags/passwords/webapp.json
index 43c0ae1ced..43c0ae1ced 100644
--- a/spec/e2e/data_bags/passwords/webapp.json
+++ b/kitchen-tests/data_bags/passwords/webapp.json
diff --git a/spec/e2e/test/fixtures/platforms/ubuntu/12.04.json b/kitchen-tests/test/fixtures/platforms/ubuntu/12.04.json
index 5e436a3cb0..5e436a3cb0 100644
--- a/spec/e2e/test/fixtures/platforms/ubuntu/12.04.json
+++ b/kitchen-tests/test/fixtures/platforms/ubuntu/12.04.json
diff --git a/spec/e2e/test/fixtures/serverspec_helper.rb b/kitchen-tests/test/fixtures/serverspec_helper.rb
index 3a2c05f9cf..3a2c05f9cf 100644
--- a/spec/e2e/test/fixtures/serverspec_helper.rb
+++ b/kitchen-tests/test/fixtures/serverspec_helper.rb
diff --git a/spec/e2e/test/integration/webapp/serverspec/localhost/default_spec.rb b/kitchen-tests/test/integration/webapp/serverspec/localhost/default_spec.rb
index b6c899620e..e604de8f7f 100644
--- a/spec/e2e/test/integration/webapp/serverspec/localhost/default_spec.rb
+++ b/kitchen-tests/test/integration/webapp/serverspec/localhost/default_spec.rb
@@ -4,7 +4,8 @@ require "uri"
 
 require "#{ENV['BUSSER_ROOT']}/../kitchen/data/serverspec_helper"
 
-describe "webapp::default" do
+describe "webapp::default", :end_to_end => true do
+
   describe "installed packages" do
     shared_examples_for "a package" do
       it "is installed" do
diff --git a/spec/e2e/Gemfile b/spec/e2e/Gemfile
deleted file mode 100644
index f9bf007ac7..0000000000
--- a/spec/e2e/Gemfile
+++ /dev/null
@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-group :end_to_end do
-  gem 'berkshelf'
-  gem 'test-kitchen', :github => 'mcquin/test-kitchen',
-                      :branch => 'mcquin/install_chef_from_github'
-
-  gem 'kitchen-vagrant'
-  gem 'kitchen-ec2'
-end