diff --git a/.kitchen.yml b/.kitchen.yml
index efd96c9..3e0768d 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,16 +1,27 @@
 ---
 driver:
-  name: vagrant
+  name: docker
+
+driver_config:
+  use_sudo: false
+  privileged: true
+  provision_command: mkdir -p /run/sshd
+  run_command: /lib/systemd/systemd
 
 platforms:
-  - name: centos-7.2
+  - name: debian-9
+  - name: ubuntu-18.04
+  - name: centos-7
 
 provisioner:
   name: salt_solo
-  salt_install: bootstrap
-  salt_bootstrap_url: https://bootstrap.saltstack.com
+  log_level: info
+  require_chef: false
   salt_version: latest
   formula: firewalld
+  salt_copy_filter:
+    - .kitchen
+    - .git
   pillars:
     top.sls:
       base:
@@ -28,10 +39,17 @@ provisioner:
                 - 24007-24008
                 - 49152-49200
 
+verifier:
+  name: inspec
+  sudo: false
+  # cli, documentation, html, progress, json, json-min, json-rspec, junit
+  reporter: cli
+  inspec_tests:
+    - path: test/integration/default
+
 suites:
   - name: default
     provisioner:
-      salt_bootstrap_options: -X -d
       state_top:
         base:
           '*':
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..dde9c8f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+sudo: required
+cache: bundler
+language: ruby
+
+services:
+  - docker
+
+before_install:
+  - bundle install
+
+env:
+  matrix:
+    - INSTANCE: default-debian-9
+    - INSTANCE: default-ubuntu-1804
+    - INSTANCE: default-centos-7
+
+script:
+  - bundle exec kitchen verify ${INSTANCE}
+
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..67a327c
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "test-kitchen", '>=1.20.0'
+gem "kitchen-docker"
+gem "kitchen-salt", ">=0.1.0"
+gem "kitchen-inspec"
+
diff --git a/README.rst b/README.rst
index 5772d91..4a5e139 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,11 @@
-===========
+=================
 firewalld-formula
-===========
+=================
 
 Salt Stack Formula to set up and configure Firewalld, dynamically managed firewall with support for network/firewall zones to define the trust level of network connections or interfaces
 
+.. image:: https://travis-ci.org/saltstack-formulas/firewalld-formula.svg?branch=master
+
 NOTICE BEFORE YOU USE
 =====================
 
@@ -30,7 +32,7 @@ Available states
     :local:
 
 ``firewalld``
--------
+-------------
 Manage firewalld
 
 Additional resources
@@ -58,8 +60,7 @@ Salt Compatibility
 
 Tested with:
 
-* 2014.1.x
-* 2015.5.x
+* 2018.3.x (will probably work too with 2017.x.x)
 
 OS Compatibility
 ================
@@ -67,4 +68,5 @@ OS Compatibility
 Tested with:
 
 * CentOS 7
-* Archlinux
+* Debian 9
+* Ubuntu 18.04
diff --git a/test/integration/default/serverspec/firewalld_server_spec.rb b/test/integration/default/firewalld_spec.rb
similarity index 60%
rename from test/integration/default/serverspec/firewalld_server_spec.rb
rename to test/integration/default/firewalld_spec.rb
index dddd8dd..07d3a60 100644
--- a/test/integration/default/serverspec/firewalld_server_spec.rb
+++ b/test/integration/default/firewalld_spec.rb
@@ -1,6 +1,3 @@
-require 'serverspec'
-set :backend, :exec
-
 describe service('firewalld') do
   it { should be_running }
 end