diff --git a/Vagrantfile b/Vagrantfile
index 09adb7ba..4a9f4ade 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -15,6 +15,9 @@ Vagrant.configure("2") do |config|
       ansible.skip_tags = ['V-38496']
       # we need to run as sudo for a lot of the checks ansible-security runs
       ansible.raw_arguments = ['-s']
+      ansible.groups = {
+        "ubuntu" => ["ubuntu1404"]
+      }
     end
   end
 
@@ -30,6 +33,9 @@ Vagrant.configure("2") do |config|
       ansible.skip_tags = ['V-38496']
       # we need to run as sudo for a lot of the checks ansible-security runs
       ansible.raw_arguments = ['-s']
+      ansible.groups = {
+        "ubuntu" => ["ubuntu1604"]
+      }
     end
   end
 
@@ -45,6 +51,9 @@ Vagrant.configure("2") do |config|
       ansible.skip_tags = ['V-38496']
       # we need to run as sudo for a lot of the checks ansible-security runs
       ansible.raw_arguments = ['-s']
+      ansible.groups = {
+        "centos" => ["centos7"]
+      }
     end
   end
 end
diff --git a/tests/vagrant.yml b/tests/vagrant.yml
index 040006ba..04426455 100644
--- a/tests/vagrant.yml
+++ b/tests/vagrant.yml
@@ -13,6 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: Prepare centos/7 box for role testing
+  hosts: centos
+  tasks:
+  - name: Import all archive signing keys from /etc/pki/rpm-gpg
+    shell: rpm --import /etc/pki/rpm-gpg/*
+
+  - name: Use sha512 instead of md5 as password hashing algorithm
+    shell: authconfig --passalgo=sha512 --update
+
 - name: Playbook for role testing
   hosts: all
   roles: