diff --git a/Gemfile b/Gemfile
index 1299374..31c90b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,7 @@
+## THIS GEMFILE IS DEPRECATED AND WILL BE REMOVED AFTER THE NEXT RELEASE
+## THERE WON'T BE ANY UPDATES TO THIS FILE DURING THIS RELEASE CYCLE
+## WE SWITCHED TO CHEFDK AS THE BUNDLE FOR THE NEEDED GEMS
+
 source 'https://rubygems.org'
 
 gem 'chef', '~> 11.18.6'
diff --git a/Rakefile b/Rakefile
index 7374f88..357a6c0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,39 +2,25 @@ task default: ["test"]
 
 task :test => [:lint, :style, :unit]
 
-desc "Bundler preparation"
-task :bundler_prep do
-  mkdir_p '.bundle'
-  sh %{bundle install --path=.bundle --jobs 1 --retry 3 --verbose}
+task :berks_prep do
+  sh %{chef exec berks vendor}
 end
 
-desc "Bershelf preparation"
-task :berks_prep => :bundler_prep do
-  sh %{bundle exec berks vendor}
+task :lint do
+  sh %{chef exec foodcritic --epic-fail any --tags ~FC003 --tags ~FC023 .}
 end
 
-desc "Foodcritic linting"
-task :lint => :bundler_prep do
-  sh %{bundle exec foodcritic --epic-fail any --tags ~FC003 --tags ~FC023 .}
+task :style do
+  sh %{chef exec rubocop}
 end
 
-desc "Rubocop style checking"
-task :style => :bundler_prep do
-  sh %{bundle exec rubocop}
-end
-
-desc "Unit testing"
 task :unit => :berks_prep do
-  sh %{bundle exec rspec --format documentation}
+  sh %{chef exec rspec --format documentation}
 end
 
-desc "Clean up working directory"
 task :clean do
   rm_rf [
-    '.bundle',
     'berks-cookbooks',
-    'Gemfile.lock',
     'Berksfile.lock'
   ]
 end
-
diff --git a/TESTING.md b/TESTING.md
index fa2e9c1..d9a964d 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,18 +1,18 @@
 # Testing the Cookbook #
 
-This cookbook uses [bundler](http://gembundler.com/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have `ruby 1.9.x`, `bundler`, `rake`, build essentials and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead).
+This cookbook uses [chefdk](https://downloads.chef.io/chef-dk/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have chefdk and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). For more detailed information on what needs to be installed, you can have a quick look into the bootstrap.sh file in this repository, which does install all the needed things to get going on ubuntu trusty. The tests defined in the Rakefile include lint, style and unit. For integration testing please refere to the [openstack-chef-repo](https://github.com/stackforge/openstack-chef-repo).
 
-We have three test suites which you can run individually (there are three rake tasks):
+We have three test suites which you can run either, individually (there are three rake tasks):
 
-    $ rake lint
-    $ rake style
-    $ rake unit
+    $ chef exec rake lint
+    $ chef exec rake style
+    $ chef exec rake unit
 
 or altogether:
 
-    $ rake test
+    $ chef exec rake
 
-The `rake` tasks will take care of installing the needed gem dependencies and cookbooks with `berkshelf`.
+The `rake` tasks will take care of installing the needed cookbooks with `berkshelf`.
 
 ## Rubocop  ##
 
@@ -27,4 +27,4 @@ The `rake` tasks will take care of installing the needed gem dependencies and co
 
 ## Chefspec
 
-[ChefSpec](https://github.com/sethvargo/chefspec/) is a unit testing framework for testing Chef cookbooks. ChefSpec makes it easy to write examples and get fast feedback on cookbook changes without the need for virtual machines or cloud servers.
+[ChefSpec](https://github.com/sethvargo/chefspec) is a unit testing framework for testing Chef cookbooks. ChefSpec makes it easy to write examples and get fast feedback on cookbook changes without the need for virtual machines or cloud servers.
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 0000000..f38a960
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -x
+## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'.
+## It relies on the common bootstrap.sh from stackforge/cookbook-openstack-common for installing common dependencies.
+
+curl https://raw.githubusercontent.com/stackforge/cookbook-openstack-common/master/bootstrap.sh \
+  --retry 3 \
+  --silent \
+  --show-error \
+  | /bin/bash -x
diff --git a/spec/api_spec.rb b/spec/api_spec.rb
index 171f367..934abb9 100644
--- a/spec/api_spec.rb
+++ b/spec/api_spec.rb
@@ -22,7 +22,7 @@ require_relative 'spec_helper'
 
 describe 'openstack-bare-metal::api' do
   describe 'ubuntu' do
-    let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) }
+    let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
     let(:node) { runner.node }
     let(:chef_run) { runner.converge(described_recipe) }
 
diff --git a/spec/conductor_spec.rb b/spec/conductor_spec.rb
index cfcdcb6..0235743 100644
--- a/spec/conductor_spec.rb
+++ b/spec/conductor_spec.rb
@@ -22,7 +22,7 @@ require_relative 'spec_helper'
 
 describe 'openstack-bare-metal::conductor' do
   describe 'ubuntu' do
-    let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) }
+    let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
     let(:node) { runner.node }
     let(:chef_run) { runner.converge(described_recipe) }
 
diff --git a/spec/ironic-common_spec.rb b/spec/ironic-common_spec.rb
index 91a7a62..953cbad 100644
--- a/spec/ironic-common_spec.rb
+++ b/spec/ironic-common_spec.rb
@@ -22,7 +22,7 @@ require_relative 'spec_helper'
 
 describe 'openstack-bare-metal::ironic-common' do
   describe 'ubuntu' do
-    let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) }
+    let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
     let(:node) { runner.node }
     let(:chef_run) { runner.converge(described_recipe) }