diff --git a/unit_test/test_application.php b/unit_test/test_application.php
index 3c25a4a..f46e267 100644
--- a/unit_test/test_application.php
+++ b/unit_test/test_application.php
@@ -197,6 +197,8 @@ function test_application_getWithRating()
         return false;
     }
     
+    delete_app_and_user($oApp, $oUser);
+
     return true;
 } 
 
diff --git a/unit_test/test_maintainer.php b/unit_test/test_maintainer.php
index 2903eff..a7c75dc 100644
--- a/unit_test/test_maintainer.php
+++ b/unit_test/test_maintainer.php
@@ -302,6 +302,8 @@ function test_superMaintainerOnAppSubmit()
 
     Maintainer::deleteMaintainer($oUser, $iAppId);
 
+    $oApp->delete();
+
     return true;
 }
 
diff --git a/unit_test/test_url.php b/unit_test/test_url.php
index 9303e1a..c4758ff 100644
--- a/unit_test/test_url.php
+++ b/unit_test/test_url.php
@@ -14,8 +14,7 @@ function test_url_update()
     $bSuccess = true; // default to success until we detect failure
 
     /* Log in */
-    $oUser = new User();
-    if($retval = $oUser->login($test_email, $test_password) != SUCCESS)
+    if(!$oUser = create_and_login_user())
     {
         echo "Received '$retval' instead of SUCCESS('".SUCCESS."').";
         return FALSE;
@@ -61,6 +60,7 @@ function test_url_update()
     }
 
     $oUrl->delete(TRUE);
+    $oUser->delete();
 
     return $bSuccess;
 }