diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 0860daf70862fc4558bac0a223cfd47064fef72f..5e0d3743a012eaaa93b96fcabe29209f611a977d 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -400,8 +400,8 @@ java/io/File/Basic.java                                         windows-all
 # 6963118
 java/nio/channels/Selector/Wakeup.java                          windows-all
 
-# 7076700
-java/nio/channels/SocketChannel/AdaptSocket.java                generic-all
+# 7052549
+java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java 	windows-all
 
 ############################################################################
 
diff --git a/test/java/nio/channels/AsynchronousSocketChannel/Basic.java b/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
index 32b6c83773332d026d48a8a2e2bd4b9dd75ed9f6..9442f9b54089e80a231d8709a2c37c5ed7fa586b 100644
--- a/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
+++ b/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
@@ -63,7 +63,9 @@ public class Basic {
         testRead3();
         testWrite1();
         testWrite2();
-        testTimeout();
+        // skip timeout tests until 7052549 is fixed
+        if (!System.getProperty("os.name").startsWith("Windows"))
+            testTimeout();
         testShutdown();
     }