diff --git a/.kitchen.yml b/.kitchen.yml
index 0284b0b..a17e77f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -74,8 +74,7 @@ suites:
     attributes:
       extra_vars:
         es_plugins:
-          - plugin: lmenezes/elasticsearch-kopf
-            version: master
+          - plugin: mapper-murmur3
     provisioner:
       playbook: test/integration/package.yml
   - name: config-2x
@@ -88,8 +87,7 @@ suites:
     attributes:
       extra_vars:
         es_plugins:
-          - plugin: lmenezes/elasticsearch-kopf
-            version: master
+          - plugin: mapper-murmur3
     provisioner:
       playbook: test/integration/multi.yml
   - name: xpack-2x
diff --git a/test/integration/config-1x/config.yml b/test/integration/config-1x/config.yml
deleted file mode 100644
index a3c37e1..0000000
--- a/test/integration/config-1x/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- host: test-kitchen
diff --git a/test/integration/config-1x/serverspec/default_spec.rb b/test/integration/config-1x/serverspec/default_spec.rb
deleted file mode 100644
index 404dd30..0000000
--- a/test/integration/config-1x/serverspec/default_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'config_spec'
-
-describe 'Config Tests v 1.x' do
-  include_examples 'config::init', "1.7.3"
-end
-
diff --git a/test/integration/helpers/serverspec/xpack_spec.rb b/test/integration/helpers/serverspec/xpack_spec.rb
index 2bc671d..14cd42d 100644
--- a/test/integration/helpers/serverspec/xpack_spec.rb
+++ b/test/integration/helpers/serverspec/xpack_spec.rb
@@ -120,12 +120,12 @@ shared_examples 'xpack::init' do |es_version|
     its(:exit_status) { should eq 0 }
   end
 
-  describe file('/usr/share/elasticsearch/plugins/kopf') do
+  describe file('/usr/share/elasticsearch/plugins/mapper-murmur3') do
     it { should be_directory }
     it { should be_owned_by 'elasticsearch' }
   end
 
-  describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep kopf') do
+  describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep mapper-murmur3') do
     its(:exit_status) { should eq 0 }
   end
 
diff --git a/test/integration/multi-1x/multi.yml b/test/integration/multi-1x/multi.yml
deleted file mode 100644
index a3c37e1..0000000
--- a/test/integration/multi-1x/multi.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- host: test-kitchen
diff --git a/test/integration/multi-1x/serverspec/default_spec.rb b/test/integration/multi-1x/serverspec/default_spec.rb
deleted file mode 100644
index 4fbbceb..0000000
--- a/test/integration/multi-1x/serverspec/default_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'multi_spec'
-
-
-describe 'Multi Tests v 1.x' do
-  include_examples 'multi::init', "1.7.3", ["kopf","marvel"]
-end
\ No newline at end of file
diff --git a/test/integration/multi-2x/serverspec/default_spec.rb b/test/integration/multi-2x/serverspec/default_spec.rb
index 81637c4..703ad1a 100644
--- a/test/integration/multi-2x/serverspec/default_spec.rb
+++ b/test/integration/multi-2x/serverspec/default_spec.rb
@@ -2,7 +2,7 @@ require 'multi_spec'
 
 
 describe 'Multi Tests v 2.x' do
-  include_examples 'multi::init', "2.3.4", ["kopf"]
+  include_examples 'multi::init', "2.3.4", ["mapper-murmur3"]
 end
 
 
diff --git a/test/integration/package-1x/package.yaml b/test/integration/package-1x/package.yaml
deleted file mode 100644
index a3c37e1..0000000
--- a/test/integration/package-1x/package.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- host: test-kitchen
diff --git a/test/integration/package-1x/serverspec/default_spec.rb b/test/integration/package-1x/serverspec/default_spec.rb
deleted file mode 100644
index b22af05..0000000
--- a/test/integration/package-1x/serverspec/default_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'package_spec'
-
-describe 'Package Tests v 1.x' do
-  include_examples 'package::init', "1.7.3", ["kopf","marvel"]
-end
\ No newline at end of file
diff --git a/test/integration/package-2x/serverspec/default_spec.rb b/test/integration/package-2x/serverspec/default_spec.rb
index 417df47..4cb829c 100644
--- a/test/integration/package-2x/serverspec/default_spec.rb
+++ b/test/integration/package-2x/serverspec/default_spec.rb
@@ -2,5 +2,5 @@ require 'package_spec'
 
 
 describe 'Package Tests v 2.x' do
-  include_examples 'package::init', "2.3.4", ["kopf"]
+  include_examples 'package::init', "2.3.4", ["mapper-murmur3"]
 end
\ No newline at end of file
diff --git a/test/integration/standard-1x/serverspec/default_spec.rb b/test/integration/standard-1x/serverspec/default_spec.rb
deleted file mode 100644
index 67f3c99..0000000
--- a/test/integration/standard-1x/serverspec/default_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'standard_spec'
-
-
-describe 'Standard Tests v 1.x' do
-  include_examples 'standard::init', "1.7.3"
-end
-
-
diff --git a/test/integration/standard-1x/standard.yml b/test/integration/standard-1x/standard.yml
deleted file mode 100644
index a3c37e1..0000000
--- a/test/integration/standard-1x/standard.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- host: test-kitchen
diff --git a/test/integration/xpack.yml b/test/integration/xpack.yml
index 25ece50..2c098bb 100644
--- a/test/integration/xpack.yml
+++ b/test/integration/xpack.yml
@@ -10,8 +10,7 @@
     es_enable_xpack: true
     es_xpack_license: "{{ lookup('file', '/tmp/license.json')  }}"
     es_plugins:
-      - plugin: lmenezes/elasticsearch-kopf
-        version: master
+      - plugin: mapper-murmur3
     es_xpack_features:
       - shield
       - watcher