diff --git a/tests/integration/analytics/default_spec.rb b/tests/integration/analytics/default_spec.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/analytics/default_spec.rb
+++ /dev/null
diff --git a/tests/integration/cluster/default_spec.rb b/tests/integration/cluster/default_spec.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/cluster/default_spec.rb
+++ /dev/null
diff --git a/tests/integration/control/default_spec.rb b/tests/integration/control/default_spec.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/control/default_spec.rb
+++ /dev/null
diff --git a/tests/integration/helpers/spec_helper.rb b/tests/integration/helpers/spec_helper.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/helpers/spec_helper.rb
+++ /dev/null
diff --git a/tests/integration/single/default_spec.rb b/tests/integration/single/default_spec.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/single/default_spec.rb
+++ /dev/null
diff --git a/tests/integration/tor/default_spec.rb b/tests/integration/tor/default_spec.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/tor/default_spec.rb
+++ /dev/null
diff --git a/tests/integration/vrouter/default_spec.rb b/tests/integration/vrouter/default_spec.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/vrouter/default_spec.rb
+++ /dev/null
diff --git a/tests/integration/vrouter_kubernetes/default_spec.rb b/tests/integration/vrouter_kubernetes/default_spec.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/vrouter_kubernetes/default_spec.rb
+++ /dev/null
diff --git a/tests/pillar/analytics.sls b/tests/pillar/analytics.sls
index 0fe58c0..7ef9977 100644
--- a/tests/pillar/analytics.sls
+++ b/tests/pillar/analytics.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 3.0
+    version: 2.2
     identity:
       engine: keystone
       host: 127.0.0.1
@@ -12,7 +12,7 @@
       host: 127.0.0.1
       port: 9696
   collector:
-    version: 3.0
+    version: 2.2
     enabled: true
     bind:
       address: 127.0.0.1
@@ -30,7 +30,7 @@
       - host: 127.0.0.1
         port: 9160
   database:
-    version: 3.0
+    version: 2.2
     cassandra:
       version: 2
     enabled: true
@@ -52,4 +52,4 @@
     - host: 127.0.0.1
       id: 2
     - host: 127.0.0.1
-      id: 3
+      id: 3
\ No newline at end of file
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index 29e22c9..a1984fd 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 3.0
+    version: 2.2
     source:
       engine: pkg
       address: http://mirror.robotice.cz/contrail-havana/
@@ -15,7 +15,7 @@
       host: 127.0.0.1
       port: 9696
   config:
-    version: 3.0
+    version: 2.2
     enabled: true
     multi_tenancy: false
     network:
@@ -66,7 +66,7 @@
     - host: 127.0.0.1
       id: 3
   control:
-    version: 3.0
+    version: 2.2
     enabled: true
     bind:
       address: 127.0.0.1
@@ -82,7 +82,7 @@
     - host: 127.0.0.1
       id: 3
   collector:
-    version: 3.0
+    version: 2.2
     enabled: true
     bind:
       address: 127.0.0.1
@@ -100,7 +100,7 @@
       - host: 127.0.0.1
         port: 9160
   database:
-    version: 3.0
+    version: 2.2
     cassandra:
       version: 2
     enabled: true
@@ -124,7 +124,7 @@
     - host: 127.0.0.1
       id: 3
   web:
-    version: 3.0
+    version: 2.2
     enabled: True
     bind:
       address: 127.0.0.1
diff --git a/tests/pillar/control.sls b/tests/pillar/control.sls
index 3ba9d34..83ec951 100644
--- a/tests/pillar/control.sls
+++ b/tests/pillar/control.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 3.0
+    version: 2.2
     identity:
       engine: keystone
       host: 127.0.0.1
@@ -12,7 +12,7 @@
       host: 127.0.0.1
       port: 9696
   config:
-    version: 3.0
+    version: 2.2
     enabled: true
     multi_tenancy: false
     network:
@@ -63,7 +63,7 @@
     - host: 127.0.0.1
       id: 3
   control:
-    version: 3.0
+    version: 2.2
     enabled: true
     bind:
       address: 127.0.0.1
@@ -103,7 +103,7 @@
     - host: 127.0.0.1
       id: 3
   web:
-    version: 3.0
+    version: 2.2
     enabled: True
     bind:
       address: 127.0.0.1
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index faba0dc..4a253f7 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 3.0
+    version: 2.2
     source:
       engine: pkg
       address: http://mirror.robotice.cz/contrail-havana/
@@ -15,7 +15,7 @@
       host: 127.0.0.1
       port: 9696
   config:
-    version: 3.0
+    version: 2.2
     multi_tenancy: false
     enabled: true
     network:
@@ -54,7 +54,7 @@
     - host: 127.0.0.1
       id: 1
   control:
-    version: 3.0
+    version: 2.2
     enabled: true
     bind:
       address: 127.0.0.1
@@ -66,7 +66,7 @@
     - host: 127.0.0.1
       id: 1
   collector:
-    version: 3.0
+    version: 2.2
     enabled: true
     bind:
       address: 127.0.0.1
@@ -80,7 +80,7 @@
       - host: 127.0.0.1
         port: 9160
   database:
-    version: 3.0
+    version: 2.2
     cassandra:
       version: 2
     enabled: true
@@ -100,7 +100,7 @@
     - host: 127.0.0.1
       id: 1
   web:
-    version: 3.0
+    version: 2.2
     enabled: True
     bind:
       address: 127.0.0.1
diff --git a/tests/pillar/tor.sls b/tests/pillar/tor.sls
index a14ce11..2452377 100644
--- a/tests/pillar/tor.sls
+++ b/tests/pillar/tor.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 3.0
+    version: 2.2
     identity:
       engine: keystone
       host: 127.0.0.1
@@ -13,11 +13,11 @@
       port: 9696
   tor:
     enabled: true
-    version: 3.0
+    version: 2.2
     agents: 1
     control:
       address: 127.0.0.1
     interface:
       address: 127.0.0.1
     device:
-      host: 127.0.0.1
+      host: 127.0.0.1
\ No newline at end of file
diff --git a/tests/pillar/vrouter.sls b/tests/pillar/vrouter.sls
index 9ed6c71..b727821 100644
--- a/tests/pillar/vrouter.sls
+++ b/tests/pillar/vrouter.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 3.0
+    version: 2.2
     identity:
       engine: keystone
       host: 127.0.0.1
@@ -12,7 +12,7 @@
       host: 127.0.0.1
       port: 9696
   compute:
-    version: 3.0
+    version: 2.2
     enabled: True
     discovery:
       host: 127.0.0.1
@@ -22,4 +22,4 @@
       gateway: 127.0.0.1
       mask: /24
       dns: 127.0.0.1
-      mtu: 9000
+      mtu: 9000
\ No newline at end of file
diff --git a/tests/pillar/vrouter_kubernetes.sls b/tests/pillar/vrouter_kubernetes.sls
index bc5bcc6..86aa79f 100644
--- a/tests/pillar/vrouter_kubernetes.sls
+++ b/tests/pillar/vrouter_kubernetes.sls
@@ -1,11 +1,11 @@
 opencontrail:
   common:
-    version: 3.0
+    version: 2.2
     identity:
       engine: kubernetes
   compute:
     engine: kubernetes
-    version: 3.0
+    version: 2.2
     enabled: True
     discovery:
       host: 127.0.0.1
@@ -15,4 +15,4 @@
       gateway: 127.0.0.1
       mask: /24
       dns: 127.0.0.1
-      mtu: 9000
+      mtu: 9000
\ No newline at end of file