diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php
index 75be39797..88673e9cd 100644
--- a/airtime_mvc/application/upgrade/Upgrades.php
+++ b/airtime_mvc/application/upgrade/Upgrades.php
@@ -38,12 +38,6 @@ class UpgradeManager
         $schemaVersion = Application_Model_Preference::GetSchemaVersion();
         $supportedSchemaVersions = self::getSupportedSchemaVersions();
         return !in_array($schemaVersion, $supportedSchemaVersions);
-        // We shouldn't run the upgrade as a side-effect of this function!
-        /*
-        if ($upgradeNeeded) {
-            self::doUpgrade();
-        }
-        */
     }
 
     /**
@@ -187,8 +181,6 @@ abstract class AirtimeUpgrader
      * allowing child classes to overwrite _runUpgrade to reduce duplication
      */
     public function upgrade() {
-        assert($this->checkIfUpgradeSupported());
-
         try {
             // $this->toggleMaintenanceScreen(true);
 
@@ -200,6 +192,7 @@ abstract class AirtimeUpgrader
             // $this->toggleMaintenanceScreen(false);
         } catch(Exception $e) {
             // $this->toggleMaintenanceScreen(false);
+            Logging::error('Error in upgrade: '. $e->getMessage());
             return false;
         }
 
@@ -236,13 +229,12 @@ abstract class AirtimeUpgrader
     }
 
     protected function _getDbValues() {
-        $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
-        $values = parse_ini_file($airtimeConf, true);
+        $config = Config::getConfig();
 
-        $this->username = $values['database']['dbuser'];
-        $this->password = $values['database']['dbpass'];
-        $this->host     = $values['database']['host'];
-        $this->database = $values['database']['dbname'];
+        $this->username = $config['dsn']['username'];
+        $this->password = $config['dsn']['password'];
+        $this->host     = $config['dsn']['hostspec'];
+        $this->database = $config['dsn']['database'];
     }
 
     protected function _runUpgrade() {
diff --git a/airtime_mvc/tests/application/helpers/AirtimeInstall.php b/airtime_mvc/tests/application/helpers/AirtimeInstall.php
index b3ef76b64..01c1b43b7 100644
--- a/airtime_mvc/tests/application/helpers/AirtimeInstall.php
+++ b/airtime_mvc/tests/application/helpers/AirtimeInstall.php
@@ -235,23 +235,8 @@ class AirtimeInstall
         }
         AirtimeInstall::$databaseTablesCreated = true;
     }
-    public static function BypassMigrations($dir, $version)
-    {
-        $appDir = AirtimeInstall::GetAirtimeSrcDir();
-        $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ".
-                    "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
-                    "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
-                    "--no-interaction --add migrations:version $version";
-        system($command);
-    }
-    public static function MigrateTablesToVersion($dir, $version)
-    {
-        $appDir = AirtimeInstall::GetAirtimeSrcDir();
-        $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ".
-                    "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
-                    "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
-                    "--no-interaction migrations:migrate $version";
-        system($command);
+    public final static function UpdateDatabaseTables() {
+        UpgradeManager::doUpgrade();
     }
     public static function SetAirtimeVersion($p_version)
     {
diff --git a/airtime_mvc/tests/application/helpers/TestHelper.php b/airtime_mvc/tests/application/helpers/TestHelper.php
index fc8320e2c..e2953328a 100644
--- a/airtime_mvc/tests/application/helpers/TestHelper.php
+++ b/airtime_mvc/tests/application/helpers/TestHelper.php
@@ -122,7 +122,8 @@ class TestHelper
         else
         {
             //Create all the database tables
-            AirtimeInstall::createDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost);
+            AirtimeInstall::CreateDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost);
+            AirtimeInstall::UpdateDatabaseTables();
         }
     }