diff --git a/deploy/build_cookie.sql b/deploy/build_cookie.sql
index 2afa70a..aab3e92 100644
--- a/deploy/build_cookie.sql
+++ b/deploy/build_cookie.sql
@@ -15,7 +15,6 @@ language sql
 stable;
 
 revoke execute on function build_cookie(email, text) from public;
-grant execute on function build_cookie(email, text) to guest;
 grant execute on function build_cookie(email, text) to invoicer;
 grant execute on function build_cookie(email, text) to admin;
 
diff --git a/test/build_cookie.sql b/test/build_cookie.sql
index acb63f5..a4edf58 100644
--- a/test/build_cookie.sql
+++ b/test/build_cookie.sql
@@ -14,7 +14,7 @@ select function_lang_is('numerus', 'build_cookie', array ['email', 'text'], 'sql
 select function_returns('numerus', 'build_cookie', array ['email', 'text'], 'text');
 select isnt_definer('numerus', 'build_cookie', array ['email', 'text']);
 select volatility_is('numerus', 'build_cookie', array ['email', 'text'], 'stable');
-select function_privs_are('numerus', 'build_cookie', array ['email', 'text'], 'guest', array ['EXECUTE']);
+select function_privs_are('numerus', 'build_cookie', array ['email', 'text'], 'guest', array []::text[]);
 select function_privs_are('numerus', 'build_cookie', array ['email', 'text'], 'invoicer', array ['EXECUTE']);
 select function_privs_are('numerus', 'build_cookie', array ['email', 'text'], 'admin', array ['EXECUTE']);
 select function_privs_are('numerus', 'build_cookie', array ['email', 'text'], 'authenticator', array []::text[]);
@@ -35,6 +35,7 @@ select is(
 );
 
 select set_cookie('44facbb30d8a419dfd4bfbc44a4b5539d4970148dfc84bed0e/demo@tandem.blog');
+reset role;
 
 select is(
 	build_cookie(),
@@ -42,9 +43,9 @@ select is(
 	'Should build the cookie for the logged in user'
 );
 
-reset role;
 
 select set_cookie('12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524/admin@tandem.blog');
+reset role;
 
 select is(
 	build_cookie(),
@@ -52,9 +53,9 @@ select is(
 	'Should build the cookie for the other logged in user'
 );
 
-reset role;
 
 select set_cookie('ashtasth');
+reset role;
 
 select is(
 	build_cookie(),
@@ -62,7 +63,6 @@ select is(
 	'Should build the cookie for the guest user'
 );
 
-reset role;
 
 select *
 from finish();