diff --git a/.kitchen.yml b/.kitchen.yml
new file mode 100644
index 0000000..14b02ce
--- /dev/null
+++ b/.kitchen.yml
@@ -0,0 +1,54 @@
+---
+driver:
+  name: docker
+  hostname: heat.ci.local
+  use_sudo: false
+
+provisioner:
+  name: salt_solo
+  salt_install: bootstrap
+  salt_bootstrap_url: https://bootstrap.saltstack.com
+  salt_version: latest
+  require_chef: false
+  log_level: error
+  formula: heat
+  grains:
+    noservices: True
+  state_top:
+    base:
+      "*":
+        - heat
+  pillars:
+    top.sls:
+      base:
+        "*":
+          - heat
+
+verifier:
+  name: inspec
+  sudo: true
+
+
+platforms:
+  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+    driver_config:
+      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      platform: ubuntu
+
+suites:
+
+  - name: server_cluster
+    provisioner:
+      pillars-from-files:
+        heat.sls: tests/pillar/server_cluster.sls
+
+  - name: server_plugin_dirs
+    provisioner:
+      pillars-from-files:
+        heat.sls: tests/pillar/server_plugin_dirs.sls
+
+  - name: server_single
+    provisioner:
+      pillars-from-files:
+        heat.sls: tests/pillar/server_single.sls
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..4c8e84e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+sudo: required
+services:
+  - docker
+
+install:
+  - pip install PyYAML
+  - pip install virtualenv
+  - |
+    test -e Gemfile || cat <<EOF > Gemfile
+    source 'https://rubygems.org'
+    gem 'rake'
+    gem 'test-kitchen'
+    gem 'kitchen-docker'
+    gem 'kitchen-inspec'
+    gem 'inspec'
+    gem 'kitchen-salt', :git => 'https://github.com/epcim/kitchen-salt.git', :branch => 'dependencis-pkg-repo2'
+    #Waiting for PR#78
+    #gem 'kitchen-salt', '>=0.2.25'
+  - bundle install
+
+env:
+    - PLATFORM=trevorj/salty-whales:trusty
+    - PLATFORM=trevorj/salty-whales:xenial
+
+before_script:
+    - make test | tail
+
+script:
+  - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
diff --git a/tests/pillar/server_plugin_dirs.sls b/tests/pillar/server_plugin_dirs.sls
index 2ece784..ebe11e8 100644
--- a/tests/pillar/server_plugin_dirs.sls
+++ b/tests/pillar/server_plugin_dirs.sls
@@ -37,6 +37,9 @@
       tenant: service
       user: heat
       password: password
+      admin_tenant: admin
+      admin_user: admin
+      admin_password: admin
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1