diff --git a/classpath/java/lang/Thread.java b/classpath/java/lang/Thread.java
index 4279e5bfbf..c2f60b64cd 100644
--- a/classpath/java/lang/Thread.java
+++ b/classpath/java/lang/Thread.java
@@ -38,7 +38,7 @@ public class Thread implements Runnable {
 
   public Thread(ThreadGroup group, Runnable task, String name, long stackSize)
   {
-    this.group = group;
+    this.group = (group == null ? Thread.currentThread().group : group);
     this.task = task;
     this.name = name;