diff --git a/.gitignore b/.gitignore
index aa8e42a..26733ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
 *.swp
 *.pyc
 .ropeproject
+vendor/
+Gemfile*
+.bundle/
+kitchen-init.sh
diff --git a/.kitchen.yml b/.kitchen.yml
new file mode 100644
index 0000000..0d9b8f7
--- /dev/null
+++ b/.kitchen.yml
@@ -0,0 +1,49 @@
+---
+driver:
+  name: docker
+  hostname: ceph.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: ceph
+  grains:
+    noservices: True
+  state_top:
+    base:
+      "*":
+        - ceph
+  pillars:
+    top.sls:
+      base:
+        "*":
+          - ceph
+
+verifier:
+  name: inspec
+  sudo: true
+platforms:
+  - name: ubuntu-trusty
+    driver_config:
+      image: trevorj/salty-whales:trusty
+      platform: ubuntu
+
+  - name: ubuntu-xenial
+    driver_config:
+      image: trevorj/salty-whales:xenial
+      platform: ubuntu
+
+suites:
+
+  - name: ceph_client
+    provisioner:
+      pillars-from-files:
+        ceph.sls: tests/pillar/ceph_client.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..43e84c7
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,25 @@
+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
+
+before_script:
+  - make test
+
+script:
+  - test ! -e .kitchen.yml || bundle exec kitchen test
diff --git a/metadata.yml b/metadata.yml
index d80127c..e4d8b71 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
 name: "ceph"
 version: "0.2"
-source: "https://github.com/tcpcloud/salt-formula-ceph"
+source: "https://github.com/salt-formulas/salt-formula-ceph"