--- old/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java	2018-01-10 17:53:54.772720400 +0530
+++ new/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java	2018-01-10 17:53:53.410530400 +0530
@@ -448,7 +448,7 @@
                 Win32ShellFolder2 sf = (Win32ShellFolder2)dir;
 
                 return (sf.isFileSystem() && sf.parent != null &&
-                        sf.parent.equals(Win32ShellFolder2.listRoots()));
+                        sf.parent.equals(getDrives()));
             }
             String path = dir.getPath();
 
--- /dev/null	2018-01-10 17:54:03.000000000 +0530
+++ new/test/jdk/javax/swing/JFileChooser/8194044/FileSystemRootTest.java	2018-01-10 17:54:02.216719900 +0530
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2018, 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.
+ */
+
+/* @test
+ * @bug 8194044
+ * @summary Test if Win32ShellFolder2 root folder object gets identified as such.
+ * @requires os.family=="windows"
+ * @modules java.desktop/sun.awt.shell
+ * @run main FileSystemRootTest
+*/
+
+import sun.awt.shell.ShellFolder;
+import javax.swing.filechooser.FileSystemView;
+import java.io.File;
+import java.util.stream.IntStream;
+
+public class FileSystemRootTest {
+    public static void main(String[] args) throws Exception {
+        FileSystemView fileSystemView = FileSystemView.getFileSystemView();
+
+        IntStream.range(0, 50).forEach(i -> {
+            /*This is the only way to get the Win32ShellFolder2 object, since it is
+             *an internal class, which cannot be instantiated directly.
+             *On windows, this returns "C:\Users\<user-name>\Documents"
+             */
+            File def = fileSystemView.getDefaultDirectory();
+            File root = fileSystemView.getParentDirectory(
+                            fileSystemView.getParentDirectory(
+                                fileSystemView.getParentDirectory(def)));
+
+            if (! (root instanceof ShellFolder && ShellFolder.isFileSystemRoot(root))) {
+                throw new RuntimeException("Test failed: root drive reported as false");
+            }
+        });
+    }
+}