diff --git a/.kitchen.yml b/.kitchen.yml
index e6d3f6b..6bc9957 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -31,6 +31,7 @@
       base:
         "*":
           - versions
+          - repos_base
           - repos
           - galera
     versions.sls:
@@ -38,6 +39,18 @@
         version:
           mysql: <%= ENV['MYSQL_VER'] || '5.6' %>
           galera: <%= ENV['GALERA_VER'] || '3' %>
+    # NOTE(vsaienko) There is no guarntee that pillars are loaded before pillars-from-file
+    # as result we cant assume variables defined via pillars: are available when pillars-from-file
+    # is loaded. Move 'source' definitions of repos to .kitchen.yml as it used ENV variable
+    repos_base.sls:
+      linux:
+        system:
+          enabled: true
+          repo:
+            galeracluster:
+              source: deb http://releases.galeracluster.com/galera-<%=ENV['GALERA_VER'] || '3'%>/ubuntu {{ grains.get('oscodename') }} main
+            mysql-wsrep:
+              source: deb http://releases.galeracluster.com/mysql-wsrep-<%=ENV['MYSQL_VER'] || '5.6'%>/ubuntu {{ grains.get('oscodename') }} main
   pillars-from-files:
     repos.sls: tests/pillar/repo_galeracluster.sls