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