diff --git a/db/database_test.go b/db/database_test.go
index ac5f23c3a0..d7953974fe 100644
--- a/db/database_test.go
+++ b/db/database_test.go
@@ -2813,7 +2813,7 @@ func Test_resyncDocument(t *testing.T) {
 			_, err = db.UpdateSyncFun(ctx, syncFn)
 			require.NoError(t, err)
 
-			_, _, err = collection.resyncDocument(ctx, docID, realDocID(docID), false, []uint64{10}, false)
+			_, _, err = collection.resyncDocument(ctx, docID, realDocID(docID), false, []uint64{10}, true)
 			require.NoError(t, err)
 			err = collection.WaitForPendingChanges(ctx)
 			require.NoError(t, err)
@@ -2821,8 +2821,8 @@ func Test_resyncDocument(t *testing.T) {
 			syncData, err := collection.GetDocSyncData(ctx, docID)
 			assert.NoError(t, err)
 
-			assert.Len(t, syncData.ChannelSet, 2)
-			assert.Len(t, syncData.Channels, 2)
+			assert.Len(t, syncData.ChannelSet, 3)
+			assert.Len(t, syncData.Channels, 3)
 			found := false
 
 			for _, chSet := range syncData.ChannelSet {
diff --git a/rest/access_test.go b/rest/access_test.go
index f1c95038e7..13585711bc 100644
--- a/rest/access_test.go
+++ b/rest/access_test.go
@@ -138,7 +138,7 @@ func TestStarAccess(t *testing.T) {
 
 	// GET /db/_all_docs?channels=true
 	// Check that _all_docs returns the docs the user has access to:
-	response = rt.SendUserRequest("GET", "/db/_all_docs?channels=true", "", "bernard")
+	response = rt.SendUserRequest("GET", "/{{.keyspace}}/_all_docs?channels=true", "", "bernard")
 	if isAllDocsIndexExist {
 		RequireStatus(t, response, 200)
 
@@ -216,7 +216,7 @@ func TestStarAccess(t *testing.T) {
 
 	// GET /db/_all_docs?channels=true
 	// Check that _all_docs returns all docs (based on user * channel)
-	response = rt.SendUserRequest("GET", "/db/_all_docs?channels=true", "", "fran")
+	response = rt.SendUserRequest("GET", "/{{.keyspace}}/_all_docs?channels=true", "", "fran")
 	if isAllDocsIndexExist {
 		RequireStatus(t, response, 200)
 
@@ -266,7 +266,7 @@ func TestStarAccess(t *testing.T) {
 
 	// GET /db/_all_docs?channels=true
 	// Check that _all_docs only returns ! docs (based on doc ! channel)
-	response = rt.SendUserRequest("GET", "/db/_all_docs?channels=true", "", "manny")
+	response = rt.SendUserRequest("GET", "/{{.keyspace}}/_all_docs?channels=true", "", "manny")
 	if isAllDocsIndexExist {
 		RequireStatus(t, response, 200)
 		log.Printf("Response = %s", response.Body.Bytes())