diff --git a/.gitignore b/.gitignore
index 6f13b69..c941f48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 Gemfile.lock
 Berksfile.lock
 tmp/
-.jamie/
-.jamie.local.yml
+.kitchen
+.kitchen.local.yml
diff --git a/.jamie.yml b/.kitchen.yml
similarity index 97%
rename from .jamie.yml
rename to .kitchen.yml
index 7b6cea7..22ec350 100644
--- a/.jamie.yml
+++ b/.kitchen.yml
@@ -35,6 +35,7 @@ suites:
 - name: source
   run_list:
   - recipe[nodejs]
+  - recipe[nodejs::npm]
   attributes:
     nodejs:
       install_method: source
diff --git a/Gemfile b/Gemfile
index aab532f..ba069c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,15 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'foodcritic'
 gem 'berkshelf'
-gem 'jamie'
-gem 'jamie-vagrant'
+gem 'thor-foodcritic'
+gem 'vagrant', '~> 1.0.6'
+
+group :integration do
+  gem 'test-kitchen', :git => "git://github.com/opscode/test-kitchen.git", :branch => '1.0'
+  gem 'kitchen-vagrant', :git => "git://github.com/opscode/kitchen-vagrant.git"
+
+  # Change .kitchen.yml's driver_plugin to ec2 and populate
+  # .kitchen.local.yml's driver_config with aws auth data
+  gem 'kitchen-ec2', :git => "git://github.com/opscode/kitchen-ec2.git"
+end
diff --git a/Vagrantfile b/Vagrantfile
index 1d30eb1..42812ab 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,9 +1,8 @@
 # Automatically install and mount cookbooks from Berksfile
 
+require 'kitchen/vagrant'
 require 'berkshelf/vagrant'
-require 'jamie/vagrant'
 
 Vagrant::Config.run do |config|
-  Jamie::Vagrant.define_vms(config)
+  Kitchen::Vagrant.define_vms(config)
 end
-