diff --git a/src/Dao/TransactionManager.php b/src/Dao/TransactionManager.php
index e42f7481..63efee69 100644
--- a/src/Dao/TransactionManager.php
+++ b/src/Dao/TransactionManager.php
@@ -26,9 +26,9 @@ class TransactionManager
 		if ($pdo->inTransaction())
 			return $callback();
 
+		$pdo->beginTransaction();
 		try
 		{
-			$pdo->beginTransaction();
 			$ret = $callback();
 			$pdo->$operation();
 			return $ret;
diff --git a/tests/Dao/TransactionManagerTest.php b/tests/Dao/TransactionManagerTest.php
index 2769b911..6059f1bd 100644
--- a/tests/Dao/TransactionManagerTest.php
+++ b/tests/Dao/TransactionManagerTest.php
@@ -67,11 +67,11 @@ class TransactionManagerTest extends \Szurubooru\Tests\AbstractDatabaseTestCase
 
 	private function getTestDao()
 	{
-		return \Szurubooru\Injector::get(\Szurubooru\Dao\TokenDao::class);
+		return new \Szurubooru\Dao\TokenDao($this->databaseConnection);
 	}
 
 	private function getTransactionManager()
 	{
-		return \Szurubooru\Injector::get(\Szurubooru\Dao\TransactionManager::class);
+		return new \Szurubooru\Dao\TransactionManager($this->databaseConnection);
 	}
 }