diff --git a/modules/openstack_project/spec/acceptance/basic_spec.rb b/modules/openstack_project/spec/acceptance/basic_spec.rb
index b29803b92e..f0db648b6f 100755
--- a/modules/openstack_project/spec/acceptance/basic_spec.rb
+++ b/modules/openstack_project/spec/acceptance/basic_spec.rb
@@ -48,7 +48,6 @@ describe 'openstack_project::server' do
    'fungi',
    'pabelanger',
    'ianw',
-   'shrews',
    'dmsimard',
    'frickler'].each do |user|
     describe user(user) do
@@ -59,6 +58,7 @@ describe 'openstack_project::server' do
   ['slukjanov',
    'elizabeth',
    'jhesketh',
+   'shrews',
    'yolanda',
    'rcarrillocruz',
    'nibz'].each do |user|
diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml
index b698a4ca74..e24fdc4c1a 100644
--- a/playbooks/group_vars/all.yaml
+++ b/playbooks/group_vars/all.yaml
@@ -126,12 +126,6 @@ all_users:
     uid: 2025
     gid: 2025
 
-  shrews:
-    comment: David Shrewsbury
-    key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtNtbgLw0dyRVnuwZz4oUcWTzEUtpO2V47t4ykijdH1hkEe7qkuusM5bD8pC4L3wDZP5U3lsIAvZ97LCQp+MNJz1j8cjXuAboqP5FC3TtCJR1WtCWmOBSO7sIvcsgwse/9KZN/TETOGA9no1oKS43Adi9bXrRFAKDAAM34IVt/UHNS51vxUhuGv+56yJmaki7CjxrGtXcB4hi+TCQAfKJPzhAMwcFQUyvXJkRei6NN6uYyHnVtLR3KXEkeTesZ2GQxmQ+1jmCMN1zUN2VLypmDqAvlKtuQW+3nY89q4HDwzCpuC1rscJgOuncdMahTMoKA3/dQtT4WuJIwLQa3tEEn shrews2018
-    uid: 2026
-    gid: 2026
-
   jbryce:
     comment: Jonathan Bryce
     key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApFGM9q1gfiawBX5EnCQGxx2T1hwPDxrX2M64MfqcoBRpdrWRjxWm6Vhczfl+Ar2EQtGsuIm1QQiyiPL4zsJSQOfYXB0TqOQaAuFamSzZSNEm8coSa93E3zfXR9uln1lgCGutaWwH/KmGcSeAuuQCipKmKxc8QSAepGNP4Jx2L/EnXQh850xTQEIviJkJpA9oTRzXu12T7vzxsUCw041Q/KX16UvvGpt9IAoMAWFlQrMPzPFmqbUOIr7pRvv8TKcK9BNFS8S8jjT+wN0y/LY7cbTblgDfwSAl1P/naME5ugRVD5MZKixIE1F+x/j+M8+fpZ/EyR/6jSA3DYjEXOk2zQ== jbryce@jbryce-mbp-3.local
@@ -172,7 +166,6 @@ base_users:
   - fungi
   - pabelanger
   - ianw
-  - shrews
   - dmsimard
   - frickler
 # Default empty list of users to install on specific hosts or groups
@@ -185,6 +178,7 @@ disabled_users:
   - jhesketh
   - yolanda
   - rcarrillocruz
+  - shrews
 
 iptables_snmp_v4_hosts:
   # cacti02.openstack.org