diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index bb0cb68f75..407c516514 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -104,6 +104,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		self::tearDownAfterClassCleanFileCache();
 		self::tearDownAfterClassCleanStrayDataFiles($dataDir);
 		self::tearDownAfterClassCleanStrayHooks();
+		self::tearDownAfterClassCleanStrayLocks();
 
 		parent::tearDownAfterClass();
 	}
@@ -196,6 +197,13 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		\OC_Hook::clear();
 	}
 
+	/**
+	 * Clean up the list of locks
+	 */
+	static protected function tearDownAfterClassCleanStrayLocks() {
+		\OC::$server->getLockingProvider()->releaseAll();
+	}
+
 	/**
 	 * Login and setup FS as a given user,
 	 * sets the given user as the current user.