diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go
index c5fb00289..23549a9ba 100644
--- a/eth/downloader/downloader_test.go
+++ b/eth/downloader/downloader_test.go
@@ -83,7 +83,13 @@ func newTester() *downloadTester {
 // sync starts synchronizing with a remote peer, blocking until it completes.
 func (dl *downloadTester) sync(id string) error {
 	err := dl.downloader.synchronise(id, dl.peerHashes[id][0])
-	for atomic.LoadInt32(&dl.downloader.processing) == 1 {
+	for {
+		// If the queue is empty and processing stopped, break
+		hashes, blocks := dl.downloader.queue.Size()
+		if hashes+blocks == 0 && atomic.LoadInt32(&dl.downloader.processing) == 0 {
+			break
+		}
+		// Otherwise sleep a bit and retry
 		time.Sleep(time.Millisecond)
 	}
 	return err