diff --git a/tests/testcleanuplistener.php b/tests/testcleanuplistener.php
index 7065f0337b..8a9e9e6efb 100644
--- a/tests/testcleanuplistener.php
+++ b/tests/testcleanuplistener.php
@@ -166,6 +166,8 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
 	private function cleanProxies() {
 		$proxies = OC_FileProxy::getProxies();
 		OC_FileProxy::clearProxies();
+		// reenable in case some test failed to reenable them
+		OC_FileProxy::$enabled = true;
 		return count($proxies) > 0;
 	}
 }