--- old/src/java.desktop/share/classes/java/awt/Toolkit.java	2019-01-09 13:45:40.916693900 +0530
+++ new/src/java.desktop/share/classes/java/awt/Toolkit.java	2019-01-09 13:45:39.317741600 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -504,10 +504,14 @@
      * of provider names in the property list.  When a provider is found its
      * accessibility implementation will be started by calling the provider's
      * activate method.  All errors are handled via an AWTError exception.
+     *
+     * Additionally, if the provided assistive technology providers list is empty
+     * then none of the assistive technology providers will be loaded and
+     * will return without error.
      */
     private static void loadAssistiveTechnologies() {
         // Load any assistive technologies
-        if (atNames != null) {
+        if (atNames != null && !atNames.isEmpty()) {
             ClassLoader cl = ClassLoader.getSystemClassLoader();
             Set<String> names = Arrays.stream(atNames.split(","))
                                       .map(String::trim)
--- old/test/jdk/javax/accessibility/AccessibilityProvider/basic.sh	2019-01-09 13:45:49.074083600 +0530
+++ new/test/jdk/javax/accessibility/AccessibilityProvider/basic.sh	2019-01-09 13:45:47.803219700 +0530
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -22,7 +22,7 @@
 #
 # @test
 # @key headful
-# @bug 8055160
+# @bug 8055160 8216008
 # @summary Unit test for javax.accessibility.AccessibilitySPI
 #
 # @build Load FooProvider BarProvider UnusedProvider
@@ -89,6 +89,10 @@
 PROVIDER1="NoProvider"
 go fail $PROVIDER1
 
+# pass if none provider found
+PROVIDER1=
+go pass $PROVIDER1
+
 # setup for two providers
 COMMA=","