diff --git a/modules/openstack_project/spec/acceptance/basic_spec.rb b/modules/openstack_project/spec/acceptance/basic_spec.rb
index 291e871255..b29803b92e 100755
--- a/modules/openstack_project/spec/acceptance/basic_spec.rb
+++ b/modules/openstack_project/spec/acceptance/basic_spec.rb
@@ -46,13 +46,10 @@ describe 'openstack_project::server' do
    'corvus',
    'clarkb',
    'fungi',
-   'jhesketh',
    'pabelanger',
    'ianw',
    'shrews',
    'dmsimard',
-   'yolanda',
-   'rcarrillocruz',
    'frickler'].each do |user|
     describe user(user) do
       it { should exist }
@@ -61,6 +58,9 @@ describe 'openstack_project::server' do
 
   ['slukjanov',
    'elizabeth',
+   'jhesketh',
+   'yolanda',
+   'rcarrillocruz',
    'nibz'].each do |user|
     describe user(user) do
       it { should_not exist }
diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml
index 69ae053a4c..65fe1fa669 100644
--- a/playbooks/group_vars/all.yaml
+++ b/playbooks/group_vars/all.yaml
@@ -170,10 +170,7 @@ base_users:
   - corvus
   - clarkb
   - fungi
-  - jhesketh
-  - yolanda
   - pabelanger
-  - rcarrillocruz
   - ianw
   - shrews
   - dmsimard
@@ -185,6 +182,9 @@ disabled_users:
   - elizabeth
   - nibz
   - slukjanov
+  - jhesketh
+  - yolanda
+  - rcarrillocruz
 
 iptables_snmp_v4_hosts:
   # cacti02.openstack.org