diff --git a/.kitchen.yml b/.kitchen.yml
index eb4ed88..9901242 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -32,15 +32,28 @@
   name: inspec
   sudo: true
 
+docker_images:
+  - &xenial-20163 <%=ENV['IMAGE_XENIAL_20163'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19'%>
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
+  - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+
 platforms:
-  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-2016.3
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20163
       platform: ubuntu
 
+  - name: xenial-2017.7
+    driver_config:
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
+      platform: ubuntu
 
 suites:
-
   - name: network
     provisioner:
       pillars-from-files:
@@ -67,14 +80,6 @@
       pillars-from-files:
         linux.sls: tests/pillar/system.sls
 
-  - name: system_file
-    provisioner:
-      pillars-from-files:
-        linux.sls: tests/pillar/system_file.sls
-      pillars_from_directories:
-        - source: tests/example
-          dest: srv/salt/linux/files/test
-
   - name: duo
     provisioner:
       pillars-from-files:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ff8c722..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
-  - docker
-
-addons:
-  apt:
-    packages:
-    - apt-transport-https
-
-install:
-  - pip install PyYAML
-  - pip install virtualenv
-  - |
-    if [ ! -e Gemfile ]; then
-       curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
-    fi
-  - bundle install
-
-env:
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=network
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=system
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=network
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=system
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=network
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=system
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=duo
-
-before_script:
-  - set -o pipefail
-  - make test | tail
-
-script:
-  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
-  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6123573504759330786b
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: never  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
-    on_cancel: never    # options: [always|never|change] default: always
-    on_error: never    # options: [always|never|change] default: always
-  email: false
diff --git a/linux/files/test/file_template.jinja b/linux/files/test/file_template.jinja
new file mode 100644
index 0000000..e9b09f3
--- /dev/null
+++ b/linux/files/test/file_template.jinja
@@ -0,0 +1 @@
+test_file
\ No newline at end of file
diff --git a/tests/pillar/system.sls b/tests/pillar/system.sls
index 636d494..73448aa 100644
--- a/tests/pillar/system.sls
+++ b/tests/pillar/system.sls
@@ -5,6 +5,35 @@
     fqdn: linux.ci.local
   system:
     enabled: true
+    banner:
+      enabled: true
+      contents: |
+        ================= WARNING =================
+        This is tcpcloud network.
+        Unauthorized access is strictly prohibited.
+        ===========================================
+    file:
+      /tmp/sample.txt:
+        source: http://techslides.com/demos/samples/sample.txt
+        source_hash: 5452459724e85b4e12277d5f8aab8fc9
+      sample2.txt:
+        name: /tmp/sample2.txt
+        source: http://techslides.com/demos/samples/sample.txt
+      test2:
+        name: /tmp/test2.txt
+        contents: |
+          line1
+          line2
+        user: root
+        group: root
+        mode: 700
+        dir_mode: 700
+        encoding: utf-8
+        makedirs: true
+      test3:
+        name: /tmp/test3.txt
+        source: salt://linux/files/test/file_template.jinja
+        template: jinja
     apt:
       preferences:
         enabled: true
diff --git a/tests/pillar/system_banner.sls b/tests/pillar/system_banner.sls
deleted file mode 100644
index 87042a7..0000000
--- a/tests/pillar/system_banner.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-linux:
-  network:
-    enabled: true
-    hostname: linux
-    fqdn: linux.ci.local
-  system:
-    enabled: true
-    name: linux
-    banner:
-      enabled: true
-      contents: |
-        ================= WARNING =================
-        This is tcpcloud network.
-        Unauthorized access is strictly prohibited.
-        ===========================================
diff --git a/tests/pillar/system_file.sls b/tests/pillar/system_file.sls
deleted file mode 100644
index 09900af..0000000
--- a/tests/pillar/system_file.sls
+++ /dev/null
@@ -1,32 +0,0 @@
-linux:
-  network:
-    enabled: true
-    hostname: linux
-    fqdn: linux.ci.local
-  system:
-    name: linux
-    enabled: true
-    file:
-      /tmp/sample.txt:
-        source: http://techslides.com/demos/samples/sample.txt
-        source_hash: 5452459724e85b4e12277d5f8aab8fc9
-      sample2.txt:
-        name: /tmp/sample2.txt
-        source: http://techslides.com/demos/samples/sample.txt
-      test2:
-        name: /tmp/test2.txt
-        contents: |
-          line1
-          line2
-        user: root
-        group: root
-        mode: 700
-        dir_mode: 700
-        encoding: utf-8
-        makedirs: true
-      test3:
-        name: /tmp/test3.txt
-        source: salt://linux/files/test/file_template.jinja
-        template: jinja
-test:
-  example: "bar"