--- a/jdk/test/ProblemList.txt	Thu Mar 24 13:09:48 2016 -0700
+++ b/jdk/test/ProblemList.txt	Fri Mar 25 19:46:48 2016 +0800
@@ -198,6 +198,7 @@
 
 # 7158947, Solaris 11
 java/nio/file/WatchService/Basic.java				solaris-all
+java/nio/file/WatchService/MayFlies.java			solaris-all
 java/nio/file/WatchService/LotsOfEvents.java			solaris-all
 
 # 8149712

--- a/jdk/test/java/nio/channels/etc/AdaptorCloseAndInterrupt.java	Thu Mar 24 13:09:48 2016 -0700
+++ b/jdk/test/java/nio/channels/etc/AdaptorCloseAndInterrupt.java	Fri Mar 25 19:46:48 2016 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @bug 7184932
  * @summary Test asynchronous close and interrupt of timed socket adapter methods
- * @key randomness
+ * @key randomness intermittent
  */
 
 import java.io.*;