--- a/test/jdk/TEST.ROOT	Fri Mar 01 12:21:23 2019 -0300
+++ b/test/jdk/TEST.ROOT	Wed Mar 13 00:04:22 2019 -0700
@@ -22,7 +22,7 @@
 javax/management sun/awt sun/java2d javax/xml/jaxp/testng/validation java/lang/ProcessHandle
 
 # Tests that cannot run concurrently
-exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream java/util/Arrays/largeMemory java/util/BitSet/stream javax/rmi
+exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream java/util/Arrays/largeMemory java/util/BitSet/stream javax/rmi sanity/client
 # Group definitions
 groups=TEST.groups
 

--- a/test/jdk/sanity/client/README	Fri Mar 01 12:21:23 2019 -0300
+++ b/test/jdk/sanity/client/README	Wed Mar 13 00:04:22 2019 -0700
@@ -8,7 +8,7 @@
 1) Download/Install the JDK to be tested in the system.
    (For example C:/java/jdk1.9.0 in windows or 
     /export/jdk/jdk1.9.0 in linux/mac/solaris)
-2) Download/Install JTReg harness, minimum required version is 4.1 b13.    
+2) Download/Install JTReg harness.    
 3) Open terminal(cmd in windows, *not* cygwin) and go to the this directory.
 4) To run
     - see the notes below on how to prepare for the test run
@@ -42,4 +42,4 @@
 Jemmy and SwingSet3 sources are available as copies in lib folder.
 
 Original Jemmy repository is https://jemmy.java.net
-Original SwingSet3 repository is https://java.net/projects/swingset3
\ No newline at end of file
+Original SwingSet3 repository is https://java.net/projects/swingset3

--- a/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java	Fri Mar 01 12:21:23 2019 -0300
+++ b/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java	Wed Mar 13 00:04:22 2019 -0700
@@ -42,7 +42,7 @@
 
 /*
  * @test
- * @key headful screenshots intermittent
+ * @key headful screenshots
  * @summary Verifies buttons on SwingSet3 ButtonDemo page by clicking each
  *          button, taking its screenshots and checking that pressed button
  *          image is different from initial button image.

--- a/test/jdk/sanity/client/SwingSet/src/EditorPaneDemoTest.java	Fri Mar 01 12:21:23 2019 -0300
+++ b/test/jdk/sanity/client/SwingSet/src/EditorPaneDemoTest.java	Wed Mar 13 00:04:22 2019 -0700
@@ -51,7 +51,7 @@
 
 /*
  * @test
- * @key headful
+ * @key headful screenshots
  * @summary Verifies SwingSet3 EditorPaneDemo by navigating and and validating
  *  the page contents in all pages
  *

--- a/test/jdk/sanity/client/TEST.ROOT.template	Fri Mar 01 12:21:23 2019 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-# This file identifies the root of the test-suite hierarchy.
-# It also contains test-suite configuration information.
-
-# The list of keywords supported in the entire test suite.  The
-# "intermittent" keyword marks tests known to fail intermittently.
-# The "randomness" keyword marks tests using randomness with test
-# cases differing from run to run. (A test using a fixed random seed
-# would not count as "randomness" by this definition.) Extra care
-# should be taken to handle test failures of intermittent or
-# randomness tests.
-#
-# A "headful" test requires a graphical environment to meaningfully
-# run. Tests that are not headful are "headless." 
-
-keys=2d dnd i18n intermittent randomness headful
-
-# Tests that must run in othervm mode
-othervm.dirs=sanity/client/SwingSet
-
-# Tests that cannot run concurrently
-exclusiveAccess.dirs=sanity/client/SwingSet
-
-# Tests using jtreg 4.1 b13 features
-requiredVersion=4.1 b13

--- a/test/jdk/sanity/client/TEST.properties	Fri Mar 01 12:21:23 2019 -0300
+++ b/test/jdk/sanity/client/TEST.properties	Wed Mar 13 00:04:22 2019 -0700
@@ -1,3 +1,25 @@
+#  Copyright (c) 2019, 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
+#  under the terms of the GNU General Public License version 2 only, as
+#  published by the Free Software Foundation.
+#
+#  This code is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#  version 2 for more details (a copy is included in the LICENSE file that
+#  accompanied this code).
+#
+#  You should have received a copy of the GNU General Public License version
+#  2 along with this work; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+#  or visit www.oracle.com if you need additional information or have any
+#  questions.
+#
+
 # This file contains test-suite configuration information related to this portion
 # of the test suite.
 #
@@ -6,9 +28,3 @@
 
 # The list of keywords supported in this part of the test suite
 keys=screenshots
-
-# Tests that cannot run concurrently
-exclusiveAccess.dirs=SwingSet
-
-# Tests require jtreg 4.1 b13 features
-#requiredVersion=4.1 b13