diff --git a/Gemfile b/Gemfile
index 27cdc0d..11227fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,8 @@ group :development do
 end
 
 group :system_tests do
+  gem 'beaker', git: 'https://github.com/bastelfreak/beaker/', branch: 'arch2'
+  gem 'beaker-docker', git: 'https://github.com/bastelfreak/beaker-docker/', branch: 'arch'
   gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
diff --git a/metadata.json b/metadata.json
index ba7584f..10fef13 100644
--- a/metadata.json
+++ b/metadata.json
@@ -19,7 +19,7 @@
   ],
   "operatingsystem_support": [
     {
-      "operatingsystem": "ArchLinux"
+      "operatingsystem": "Archlinux"
     },
     {
       "operatingsystem": "CentOS",