diff --git a/test/organization/test.sh b/test/organization/test.sh
index 4002325..bf62953 100644
--- a/test/organization/test.sh
+++ b/test/organization/test.sh
@@ -205,6 +205,8 @@ function tear_down() {
     sql "select cartodb.CDB_Group_DropGroup('group_a')"
     sql "SELECT cartodb.CDB_Organization_RemoveAdmin('cdb_org_admin');"
 
+    sql "DROP SCHEMA cartodb CASCADE"
+
     log_info "########################### TEAR DOWN ###########################"
     sql 'DROP SCHEMA cdb_testmember_1;'
     sql 'DROP SCHEMA cdb_testmember_2;'
@@ -220,8 +222,6 @@ function tear_down() {
     sql 'DROP ROLE publicuser;'
     sql 'DROP ROLE cdb_org_admin;'
 
-    sql "DROP SCHEMA cartodb CASCADE"
-
     ${CMD} -c "DROP DATABASE ${DATABASE}"
 }