diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index ecfc948793..ebaf573753 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -372,8 +372,8 @@ abstract class phpbb_database_test_case extends TestCase
 	 * PHPUnit deprecates several methods and properties in its recent versions
 	 * Provide BC layer to be able to test in multiple environment settings
 	 */
-    public function expectException(string $exception): void
-    {
+	public function expectException(string $exception): void
+	{
 		if (version_compare(self::$phpunit_version, '9.0', '>='))
 		{
 			switch ($exception) {
@@ -408,8 +408,8 @@ abstract class phpbb_database_test_case extends TestCase
 	 * PHPUnit deprecates several methods and properties in its recent versions
 	 * Provide BC layer to be able to test in multiple environment settings
 	 */
-    public static function assertFileNotExists(string $filename, string $message = ''): void
-    {
+	public static function assertFileNotExists(string $filename, string $message = ''): void
+	{
 		if (version_compare(self::$phpunit_version, '9.0', '>='))
 		{
 			parent::assertFileDoesNotExist($filename, $message);
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index fec4709fbd..c32ebf0c71 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -392,12 +392,16 @@ class phpbb_database_test_connection_manager
 				{
 					$this->pdo->beginTransaction();
 				}
-				else if ($query === 'commit')
+				else if ($query === 'commit' && $this->pdo->inTransaction())
 				{
 					$this->pdo->commit();
 				}
 				else
 				{
+					if (!$this->pdo->inTransaction())
+					{
+						$this->pdo->beginTransaction();
+					}
 					$this->pdo->exec($query);
 				}
 			}
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index cb48de23d4..726f6671ae 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -88,8 +88,8 @@ class phpbb_test_case extends TestCase
 	 * PHPUnit deprecates several methods and properties in its recent versions
 	 * Provide BC layer to be able to test in multiple environment settings
 	 */
-    public function expectException(string $exception): void
-    {
+	public function expectException(string $exception): void
+	{
 		if (version_compare(self::$phpunit_version, '9.0', '>='))
 		{
 			switch ($exception) {
@@ -124,8 +124,8 @@ class phpbb_test_case extends TestCase
 	 * PHPUnit deprecates several methods and properties in its recent versions
 	 * Provide BC layer to be able to test in multiple environment settings
 	 */
-    public static function assertFileNotExists(string $filename, string $message = ''): void
-    {
+	public static function assertFileNotExists(string $filename, string $message = ''): void
+	{
 		if (version_compare(self::$phpunit_version, '9.0', '>='))
 		{
 			parent::assertFileDoesNotExist($filename, $message);