diff --git a/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java b/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java
index a4d0a53c3..30b44b98a 100644
--- a/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java
+++ b/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java
@@ -110,7 +110,7 @@ private void printResults(CleanupOperationResult operationResult) {
 
 		case OK:
 			if (operationResult.getMergedDatabaseFilesCount() > 0) {
-				out.println(operationResult.getMergedDatabaseFilesCount() + " database files merged into one.");
+				out.println(operationResult.getMergedDatabaseFilesCount() + " database files merged.");
 			}
 			
 			if (operationResult.getRemovedMultiChunks().size() > 0) {
diff --git a/syncany-cli/src/test/java/org/syncany/tests/cli/UpCommandTest.java b/syncany-cli/src/test/java/org/syncany/tests/cli/UpCommandTest.java
index fbe1d14fb..138b40a78 100644
--- a/syncany-cli/src/test/java/org/syncany/tests/cli/UpCommandTest.java
+++ b/syncany-cli/src/test/java/org/syncany/tests/cli/UpCommandTest.java
@@ -102,18 +102,18 @@ public void testCliSyncUpWithCleanup() throws Exception {
 		}));
 		
 		assertEquals(3, cliOut.length);
-		assertTrue(cliOut[0].contains("17 database files merged into one"));
+		assertTrue(cliOut[0].contains("22 database files merged"));
 		assertTrue(cliOut[1].contains("1 file histories shortened"));
 		assertTrue(cliOut[2].contains("Cleanup successful"));
 
-		for (int i=1; i<=16; i++) {
+		for (int i=1; i<=21; i++) {
 			DatabaseRemoteFile expectedDatabaseRemoteFile = new DatabaseRemoteFile("A", i);
 			File databaseFileInRepo = new File(connectionSettings.get("path")+"/databases/"+expectedDatabaseRemoteFile.getName());
 
 			assertFalse("Database file SHOULD NOT exist: "+databaseFileInRepo, databaseFileInRepo.exists());
 		}
 		
-		for (int i=17; i<=22; i++) {
+		for (int i=22; i<=22; i++) {
 			DatabaseRemoteFile expectedDatabaseRemoteFile = new DatabaseRemoteFile("A", i);
 			File databaseFileInRepo = new File(connectionSettings.get("path")+"/databases/"+expectedDatabaseRemoteFile.getName());