diff -r 4ebc2e2fb97c -r 71c04702a3d5 test/jdk/java/lang/Thread/MainThreadTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/Thread/MainThreadTest.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2003, 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     4533087
+ * @summary Test to see if the main thread is in its thread group
+ */
+
+public class MainThreadTest {
+    public static void main(String args[]) {
+        ThreadGroup tg = Thread.currentThread().getThreadGroup();
+        int n = tg.activeCount();
+        Thread[] ts = new Thread[n];
+        int m = tg.enumerate(ts);
+        for (int i = 0; i < ts.length; i++) {
+            if (Thread.currentThread() == ts[i]) {
+                return;
+            }
+        }
+        throw new RuntimeException(
+            "Current thread is not in its own thread group!");
+    }
+}