diff --git a/.kitchen.yml b/.kitchen.yml
index 4d05763..0b66d23 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -16,6 +16,14 @@ provisioner:
   no_proxy: localhost,127.0.0.1
   ignore_extensions_from_root: [".git",".idea",".kitchen.yml"]
   ignore_paths_from_root: [".git",".idea",".kitchen"]
+  <% if ENV['VERSION'] %>
+  attributes:
+    extra_vars:
+      es_major_version: "<%= ENV['VERSION'] %>"
+      <% if ENV['VERSION'] == '6.x' %>
+      es_version: '6.1.2'
+      <% end %>
+  <% end %>
 
 transport:
   max_ssh_sessions: 6
@@ -78,34 +86,34 @@ platforms:
       use_sudo: false
 
 suites:
-  - name: standard-5x
+  - name: standard
     provisioner:
       idempotency_test: true
       playbook: test/integration/standard.yml
     run_list:
     attributes:
-  - name: package-5x
+  - name: package
     run_list:
     attributes:
     provisioner:
       playbook: test/integration/package.yml
-  - name: config-5x
+  - name: config
     run_list:
     attributes:
     provisioner:
       playbook: test/integration/config.yml
-  - name: multi-5x
+  - name: multi
     run_list:
     attributes:
     provisioner:
       playbook: test/integration/multi.yml
       idempotency_test: true
-  - name: xpack-5x
+  - name: xpack
     run_list:
     attributes:
     provisioner:
       playbook: test/integration/xpack.yml
-  - name: xpack-standard-5x
+  - name: xpack-standard
     run_list:
     attributes:
     provisioner:
@@ -116,4 +124,4 @@ suites:
     attributes:
     provisioner:
       playbook: test/integration/issue-test.yml
-      idempotency_test: false
\ No newline at end of file
+      idempotency_test: false
diff --git a/test/integration/config-5x/config.yml b/test/integration/config/config.yml
similarity index 100%
rename from test/integration/config-5x/config.yml
rename to test/integration/config/config.yml
diff --git a/test/integration/config-5x/serverspec/default_spec.rb b/test/integration/config/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/config-5x/serverspec/default_spec.rb
rename to test/integration/config/serverspec/default_spec.rb
diff --git a/test/integration/multi-5x/multi.yml b/test/integration/multi/multi.yml
similarity index 100%
rename from test/integration/multi-5x/multi.yml
rename to test/integration/multi/multi.yml
diff --git a/test/integration/multi-5x/serverspec/default_spec.rb b/test/integration/multi/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/multi-5x/serverspec/default_spec.rb
rename to test/integration/multi/serverspec/default_spec.rb
diff --git a/test/integration/package-5x/package.yaml b/test/integration/package/package.yaml
similarity index 100%
rename from test/integration/package-5x/package.yaml
rename to test/integration/package/package.yaml
diff --git a/test/integration/package-5x/serverspec/default_spec.rb b/test/integration/package/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/package-5x/serverspec/default_spec.rb
rename to test/integration/package/serverspec/default_spec.rb
diff --git a/test/integration/standard-5x/serverspec/default_spec.rb b/test/integration/standard/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/standard-5x/serverspec/default_spec.rb
rename to test/integration/standard/serverspec/default_spec.rb
diff --git a/test/integration/standard-5x/standard.yml b/test/integration/standard/standard.yml
similarity index 100%
rename from test/integration/standard-5x/standard.yml
rename to test/integration/standard/standard.yml
diff --git a/test/integration/xpack-standard-5x/serverspec/default_spec.rb b/test/integration/xpack-standard/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/xpack-standard-5x/serverspec/default_spec.rb
rename to test/integration/xpack-standard/serverspec/default_spec.rb
diff --git a/test/integration/xpack-standard-5x/xpack-standard.yml b/test/integration/xpack-standard/xpack-standard.yml
similarity index 100%
rename from test/integration/xpack-standard-5x/xpack-standard.yml
rename to test/integration/xpack-standard/xpack-standard.yml
diff --git a/test/integration/xpack-5x/serverspec/default_spec.rb b/test/integration/xpack/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/xpack-5x/serverspec/default_spec.rb
rename to test/integration/xpack/serverspec/default_spec.rb
diff --git a/test/integration/xpack-5x/xpack.yml b/test/integration/xpack/xpack.yml
similarity index 100%
rename from test/integration/xpack-5x/xpack.yml
rename to test/integration/xpack/xpack.yml