diff --git a/.kitchen.yml b/.kitchen.yml
index a599adf..11bdbd8 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -23,14 +23,11 @@
     top.sls:
       base:
         "*":
-          - debian_etcd_repo
           - etcd
   dependencies:
     - name: linux
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/linux.git
-  pillars-from-files:
-    debian_etcd_repo.sls: tests/pillar/repo_etcd.sls
 
 verifier:
   name: inspec
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index a91825f..04d0549 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -15,3 +15,13 @@
     - host: 10.0.175.103
       name: etcd03
       port: 4001
+linux:
+  system:
+    enabled: true
+    name: system_name
+    env:
+      enabled: false
+    profile:
+      enabled: false
+    shell:
+      enabled: false
diff --git a/tests/pillar/repo_etcd.sls b/tests/pillar/repo_etcd.sls
deleted file mode 100644
index ece8131..0000000
--- a/tests/pillar/repo_etcd.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-linux:
-  system:
-    name: hostname
-    enabled: true
-    repo:
-      docker:
-        source: 'deb http://ppa.launchpad.net/cloud-green/trusty-backports/ubuntu trusty main'
-        key_id: E6396E0A9EA00B88BF1D40C434EDB5B7EC1764A6
-        key_server: hkp://p80.pool.sks-keyservers.net:80
\ No newline at end of file
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index 2f830cd..f009ddb 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -9,3 +9,13 @@
     - host: 10.0.175.101
       name: etcd01
       port: 4001
+linux:
+  system:
+    enabled: true
+    name: system_name
+    env:
+      enabled: false
+    profile:
+      enabled: false
+    shell:
+      enabled: false
\ No newline at end of file