diff --git a/Gemfile b/Gemfile
index 2ac98f8..b1042c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,8 @@ group :test do
   gem 'voxpupuli-test', '~> 9.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 4.0',  :require => false
+  #gem 'puppet_metadata', '~> 4.0',  :require => false
+  gem 'puppet_metadata', github: 'bastelfreak/puppet_metadata', branch: 'openvox2'
 end
 
 group :development do
@@ -16,6 +17,7 @@ group :development do
 end
 
 group :system_tests do
+  gem 'beaker_puppet_helpers', github: 'bastelfreak/beaker_puppet_helpers', branch: 'openvox'
   gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
diff --git a/metadata.json b/metadata.json
index 8bf5fcb..f43ff2b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -15,6 +15,10 @@
     {
       "name": "puppet",
       "version_requirement": ">= 7.0.0 < 9.0.0"
+    },
+    {
+      "name": "openvox",
+      "version_requirement": ">= 8.0.0 < 9.0.0"
     }
   ],
   "operatingsystem_support": [