diff --git a/.travis.yml b/.travis.yml
index e3e22aa..78a56b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: ruby
 rvm:
 - 1.9.3
+- 2.0.0
 deploy:
   edge: true
   provider: chef-supermarket
diff --git a/Berksfile b/Berksfile
index ab60e37..3033f03 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,3 +1,5 @@
 source 'https://supermarket.getchef.com'
 
 metadata
+
+cookbook 'wsus-client-test', path: './test/cookbooks/wsus-client-test'
diff --git a/Gemfile b/Gemfile
index b02355a..71a919d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,12 @@
 source 'https://rubygems.org'
 
+gem 'berkshelf'
+gem 'chefspec',   '>= 4.2'
+gem 'fauxhai',    '>= 2.2'
+gem 'foodcritic', '>= 4.0'
 gem 'rake'
 
-group :test do
-  gem 'foodcritic'
+if RUBY_VERSION < '2.0'
+  gem 'chef', '< 12.0'
+  gem 'ohai', '< 8.0'
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000..beffd08
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,14 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+require 'chefspec'
+require 'chefspec/berkshelf'
+
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.order = 'random'
+end
diff --git a/test/cookbooks/wsus-client-test/README.md b/test/cookbooks/wsus-client-test/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/test/cookbooks/wsus-client-test/metadata.rb b/test/cookbooks/wsus-client-test/metadata.rb
new file mode 100644
index 0000000..71a6d6d
--- /dev/null
+++ b/test/cookbooks/wsus-client-test/metadata.rb
@@ -0,0 +1,9 @@
+name             'wsus-client-test'
+maintainer       'Criteo'
+maintainer_email 'b.courtois@criteo.com'
+license          'Apache 2.0'
+description      'Test cookbook for wsus-client'
+long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '0.1.0'
+supports         'windows'
+depends          'wsus-client'