diff --git a/Command/TestRemote.hs b/Command/TestRemote.hs
index 79e0edd6af..43aa615b4d 100644
--- a/Command/TestRemote.hs
+++ b/Command/TestRemote.hs
@@ -247,6 +247,10 @@ test runannex mkr mkk =
 	, check "storeKey when already present" $ \r k ->
 		whenwritable r $ runBool (store r k)
 	, check ("present " ++ show True) $ \r k -> present r k True
+	, check "retrieveKeyFile" $ \r k -> do
+		lockContentForRemoval k noop removeAnnex
+		get r k
+	, check "fsck downloaded object" fsck
 	, check "retrieveKeyFile resume from 0" $ \r k -> do
 		tmp <- fromRawFilePath <$> prepTmp k
 		liftIO $ writeFile tmp ""
@@ -270,10 +274,6 @@ test runannex mkr mkk =
 		lockContentForRemoval k noop removeAnnex
 		get r k
 	, check "fsck downloaded object" fsck
-	, check "retrieveKeyFile" $ \r k -> do
-		lockContentForRemoval k noop removeAnnex
-		get r k
-	, check "fsck downloaded object" fsck
 	, check "removeKey when present" $ \r k -> 
 		whenwritable r $ runBool (remove r k)
 	, check ("present " ++ show False) $ \r k -> 
diff --git a/doc/bugs/tests_fail_on_windows__58___retrieveKeyFile_resume/comment_4_2666b31db5f09778073fdad17b9d8139._comment b/doc/bugs/tests_fail_on_windows__58___retrieveKeyFile_resume/comment_4_2666b31db5f09778073fdad17b9d8139._comment
deleted file mode 100644
index f7c4e4c491..0000000000
--- a/doc/bugs/tests_fail_on_windows__58___retrieveKeyFile_resume/comment_4_2666b31db5f09778073fdad17b9d8139._comment
+++ /dev/null
@@ -1,16 +0,0 @@
-[[!comment format=mdwn
- username="joey"
- subject="""comment 4"""
- date="2021-04-22T13:40:33Z"
- content="""
-Problem is confirmed to not be from the 33% test, the 0% test failed when
-run before it, also in the removeAnnex part. And removeAnnex didn't change
-lately, so it seems probably an earlier test sets up the failure.
-
-I've moved the 0% test to be the first test that retrieves the file, let's
-see if it succeeds that way, and if so, it must be that retrieveKeyFile is
-leaking a file handle, despite using withBinaryFile which is supposed to
-close handles automatically.
-
-ghc version used for this windows build is 8.8.4 btw.
-"""]]