diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index aaa9784..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        aodh.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.kitchen.yml b/.kitchen.yml
index 9300102..7afab55 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -14,15 +14,26 @@
   formula: aodh
   grains:
     noservices: True
+  dependencies:
+    - name: linux
+      repo: git
+      source: https://github.com/salt-formulas/salt-formula-linux
+    - name: keystone
+      repo: git
+      source: https://github.com/salt-formulas/salt-formula-keystone
   state_top:
     base:
       "*":
+        - linux.system
         - aodh
   pillars:
     top.sls:
       base:
         "*":
+          - linux_repo_openstack
           - aodh
+  pillars-from-files:
+    linux_repo_openstack.sls: tests/pillar/repo_mos9.sls
 
 verifier:
   name: inspec
diff --git a/.travis.yml b/.travis.yml
index 46d3f84..cc1ea51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,18 +17,19 @@
   - bundle install
 
 env:
-  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server_cluster
-  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server_single
+  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server-cluster
+  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server-single
   # Missing Trusty packages for aodh
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server_cluster
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server_single
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=server-cluster
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=server-single
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
+  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
+  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
 
 notifications:
   webhooks:
diff --git a/aodh/meta/telegraf.yml b/aodh/meta/telegraf.yml
index 695d1ba..6fe905c 100644
--- a/aodh/meta/telegraf.yml
+++ b/aodh/meta/telegraf.yml
@@ -5,5 +5,5 @@
     http_response:
       aodh-api:
         address: "http://{{ server.bind.host|replace('0.0.0.0', '127.0.0.1') }}:{{ server.bind.port }}/"
-        expected_code: 300
-{%- endif %}
\ No newline at end of file
+        expected_code: 401
+{%- endif %}
diff --git a/debian/control b/debian/control
index 114ad01..322c23f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,6 @@
 
 Package: salt-formula-aodh
 Architecture: all
-Depends: ${misc:Depends}, salt-master, reclass
+Depends: ${misc:Depends}
 Description: aodh salt formula
  Install and configure aodh system.
diff --git a/tests/pillar/repo_mos9.sls b/tests/pillar/repo_mos9.sls
new file mode 100644
index 0000000..cd14fe8
--- /dev/null
+++ b/tests/pillar/repo_mos9.sls
@@ -0,0 +1,8 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_openstack:
+        source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0 main restricted"
+        architectures: amd64
+        key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 29fb975..4ee4e0f 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -124,7 +124,7 @@
 }
 
 salt_run() {
-    [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+    [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
     salt-call ${SALT_OPTS} $*
 }