diff --git a/.gitignore b/.gitignore
index f86e0c1..b1d59bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-test/integration/.kitchen
 Berksfile.lock
+.kitchen
diff --git a/test/integration/.kitchen.yml b/.kitchen.yml
similarity index 100%
rename from test/integration/.kitchen.yml
rename to .kitchen.yml
diff --git a/Berksfile b/Berksfile
new file mode 100644
index 0000000..d39a9ca
--- /dev/null
+++ b/Berksfile
@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+source 'https://supermarket.chef.io'
+
+cookbook 'os_prepare', path: './test/cookbooks/os_prepare'
diff --git a/Rakefile b/Rakefile
index f2f6588..48e4217 100644
--- a/Rakefile
+++ b/Rakefile
@@ -123,6 +123,6 @@ namespace :test do
   task :integration do
     concurrency = ENV['CONCURRENCY'] || 1
     path = File.join(File.dirname(__FILE__), 'test', 'integration')
-    sh('sh', '-c', "cd #{path} && bundle exec kitchen test -c #{concurrency}")
+    sh('sh', '-c', "bundle exec kitchen test -c #{concurrency}")
   end
 end
diff --git a/test/integration/cookbooks/os_prepare/metadata.rb b/test/cookbooks/os_prepare/metadata.rb
similarity index 100%
rename from test/integration/cookbooks/os_prepare/metadata.rb
rename to test/cookbooks/os_prepare/metadata.rb
diff --git a/test/integration/cookbooks/os_prepare/recipes/default.rb b/test/cookbooks/os_prepare/recipes/default.rb
similarity index 100%
rename from test/integration/cookbooks/os_prepare/recipes/default.rb
rename to test/cookbooks/os_prepare/recipes/default.rb
diff --git a/test/integration/Berksfile b/test/integration/Berksfile
deleted file mode 100644
index 24bb514..0000000
--- a/test/integration/Berksfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://supermarket.chef.io'
-
-cookbook 'os_prepare', path: './cookbooks/os_prepare'
diff --git a/test/integration/test/integration/default/_debug_spec.rb b/test/integration/default/_debug_spec.rb
similarity index 100%
rename from test/integration/test/integration/default/_debug_spec.rb
rename to test/integration/default/_debug_spec.rb
diff --git a/test/integration/test/integration/default/os_spec.rb b/test/integration/default/os_spec.rb
similarity index 100%
rename from test/integration/test/integration/default/os_spec.rb
rename to test/integration/default/os_spec.rb
diff --git a/test/integration/test/integration/profile/controls/example.rb b/test/integration/profile/controls/example.rb
similarity index 100%
rename from test/integration/test/integration/profile/controls/example.rb
rename to test/integration/profile/controls/example.rb
diff --git a/test/integration/test/integration/profile/controls/gordon.rb b/test/integration/profile/controls/gordon.rb
similarity index 100%
rename from test/integration/test/integration/profile/controls/gordon.rb
rename to test/integration/profile/controls/gordon.rb
diff --git a/test/integration/test/integration/profile/inspec.yml b/test/integration/profile/inspec.yml
similarity index 100%
rename from test/integration/test/integration/profile/inspec.yml
rename to test/integration/profile/inspec.yml
diff --git a/test/integration/test/integration/profile/libraries/gordon_config.rb b/test/integration/profile/libraries/gordon_config.rb
similarity index 100%
rename from test/integration/test/integration/profile/libraries/gordon_config.rb
rename to test/integration/profile/libraries/gordon_config.rb