diff --git a/test/organization/test.sh b/test/organization/test.sh
index 1dbabeb..431c2ba 100644
--- a/test/organization/test.sh
+++ b/test/organization/test.sh
@@ -347,7 +347,7 @@ function test_cdb_querytables_does_not_return_functions_as_part_of_the_resultset
 }
 
 function test_cdb_usertables_should_work_with_orgusers() {
-    sql "CREATE ROLE publicuser"
+    sql "ALTER USER publicuser LOGIN"
     sql "GRANT USAGE ON SCHEMA cartodb TO publicuser;"
     ${CMD} -d ${DATABASE} -f scripts-available/CDB_UserTables.sql
     sql cdb_testmember_1 "CREATE TABLE test_perms_pub (a int)"
@@ -363,6 +363,7 @@ function test_cdb_usertables_should_work_with_orgusers() {
 
     sql cdb_testmember_1 "DROP TABLE test_perms_pub"
     sql cdb_testmember_1 "DROP TABLE test_perms_priv"
+    sql "ALTER USER publicuser NOLOGIN"
 }