diff --git a/.kitchen.yml b/.kitchen.yml
index 205a0f80bb364..d3f27a6edca5f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -55,6 +55,14 @@ verifier:
   ruby_bindir: '/usr/bin'
 
 suites:
-  - name: default
+  - name: standard
+    provisioner:
+      playbook: test/integration/standard.yml
     run_list:
     attributes:
+  - name: package
+    run_list:
+    attributes:
+    provisioner:
+      playbook: test/integration/package.yml
+
diff --git a/test/integration/package.yml b/test/integration/package.yml
new file mode 100644
index 0000000000000..6b0c7e2cc98ee
--- /dev/null
+++ b/test/integration/package.yml
@@ -0,0 +1,6 @@
+---
+- name: Elasticsearch Package tests
+  hosts: localhost
+  roles:
+    - elasticsearch
+  vars:
diff --git a/test/integration/default/default.yaml b/test/integration/package/package.yaml
similarity index 100%
rename from test/integration/default/default.yaml
rename to test/integration/package/package.yaml
diff --git a/test/integration/package/serverspec/default_spec.rb b/test/integration/package/serverspec/default_spec.rb
new file mode 100644
index 0000000000000..10a66d36d2c28
--- /dev/null
+++ b/test/integration/package/serverspec/default_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+context "basic tests" do
+
+  describe user('elasticsearch') do
+    it { should exist }
+  end
+
+  describe service('elasticsearch') do
+    it { should be_running }
+  end
+
+  describe package('elasticsearch') do
+    it { should be_installed }
+  end
+
+  describe file('/etc/elasticsearch/elasticsearch.yml') do
+    it { should be_file }
+  end
+
+end
+
diff --git a/test/integration/default/serverspec/spec_helper.rb b/test/integration/package/serverspec/spec_helper.rb
similarity index 100%
rename from test/integration/default/serverspec/spec_helper.rb
rename to test/integration/package/serverspec/spec_helper.rb
diff --git a/test/integration/default.yml b/test/integration/standard.yml
similarity index 87%
rename from test/integration/default.yml
rename to test/integration/standard.yml
index 27b5bc6a9c950..da56a19cce63a 100644
--- a/test/integration/default.yml
+++ b/test/integration/standard.yml
@@ -4,6 +4,7 @@
   roles:
     - elasticsearch
   vars:
+    es_use_repository: "true"
     es_plugins:
       - plugin: lmenezes/elasticsearch-kopf
         version: master
diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/standard/serverspec/default_spec.rb
similarity index 100%
rename from test/integration/default/serverspec/default_spec.rb
rename to test/integration/standard/serverspec/default_spec.rb
diff --git a/test/integration/standard/serverspec/spec_helper.rb b/test/integration/standard/serverspec/spec_helper.rb
new file mode 100644
index 0000000000000..590c2fa95fe6c
--- /dev/null
+++ b/test/integration/standard/serverspec/spec_helper.rb
@@ -0,0 +1,2 @@
+require 'serverspec'
+set :backend, :exec
diff --git a/test/integration/standard/standard.yml b/test/integration/standard/standard.yml
new file mode 100644
index 0000000000000..a3c37e1917aea
--- /dev/null
+++ b/test/integration/standard/standard.yml
@@ -0,0 +1,2 @@
+---
+- host: test-kitchen