diff --git a/lib/java/test/org/apache/thrift/TestTUnion.java b/lib/java/test/org/apache/thrift/TestTUnion.java
new file mode 100644
index 0000000..bf8ee83
--- /dev/null
+++ b/lib/java/test/org/apache/thrift/TestTUnion.java
@@ -0,0 +1,143 @@
+package org.apache.thrift;
+
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TMemoryBuffer;
+
+import thrift.test.ComparableUnion;
+import thrift.test.Empty;
+import thrift.test.SomeEnum;
+import thrift.test.StructWithAUnion;
+import thrift.test.TestUnion;
+import thrift.test.TestUnionMinusStringField;
+import junit.framework.TestCase;
+
+public class TestTUnion extends TestCase {
+
+  public void testBasic() throws Exception {
+    TestUnion union = new TestUnion();
+
+    assertFalse(union.isSet());
+    assertNull(union.getFieldValue());
+
+    union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
+
+    assertEquals(Integer.valueOf(25), union.getFieldValue());
+  
+    assertEquals(Integer.valueOf(25), union.getFieldValue(TestUnion._Fields.I32_FIELD));
+  
+    try {
+      union.getFieldValue(TestUnion._Fields.STRING_FIELD);
+      fail("should have thrown an exception");
+    } catch (IllegalArgumentException e) {
+      // cool!
+    }
+
+    union = new TestUnion();
+
+    // should not throw an exception here
+    union.hashCode();
+
+    union.setI32_field(1);
+    assertEquals(1, union.getI32_field());
+    union.hashCode();
+
+    try {
+      union.getString_field();
+      fail("should have thrown an exception");
+    } catch (Exception e) {
+      // sweet
+    }
+
+    union = TestUnion.i32_field(1);
+
+    assertFalse(union.equals((TestUnion)null));
+
+    union = TestUnion.enum_field(SomeEnum.ONE);
+    union.hashCode();
+
+    union = new TestUnion();
+    // should not throw an exception
+    union.toString();
+  }
+
+  public void testCompareTo() throws Exception {
+    ComparableUnion cu = ComparableUnion.string_field("a");
+    ComparableUnion cu2 = ComparableUnion.string_field("b");
+
+    assertTrue(cu.compareTo(cu) == 0);
+    assertTrue(cu2.compareTo(cu2) == 0);
+
+    assertTrue(cu.compareTo(cu2) < 0);
+    assertTrue(cu2.compareTo(cu) > 0);
+
+    cu2 = ComparableUnion.binary_field(new byte[]{2});
+
+    assertTrue(cu.compareTo(cu2) < 0);
+    assertTrue(cu2.compareTo(cu) > 0);
+
+    cu = ComparableUnion.binary_field(new byte[]{1});
+
+    assertTrue(cu.compareTo(cu2) < 0);
+    assertTrue(cu2.compareTo(cu) > 0);
+  }
+
+  public void testEquality() throws Exception {
+    TestUnion union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
+
+    TestUnion otherUnion = new TestUnion(TestUnion._Fields.STRING_FIELD, "blah!!!");
+
+    assertFalse(union.equals(otherUnion));
+
+    otherUnion = new TestUnion(TestUnion._Fields.I32_FIELD, 400);
+
+    assertFalse(union.equals(otherUnion));
+
+    otherUnion = new TestUnion(TestUnion._Fields.OTHER_I32_FIELD, 25);
+
+    assertFalse(union.equals(otherUnion));
+  }
+
+  public void testSerialization() throws Exception {
+    TestUnion union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
+
+    TMemoryBuffer buf = new TMemoryBuffer(0);
+    TProtocol proto = new TBinaryProtocol(buf);
+
+    union.write(proto);
+
+    TestUnion u2 = new TestUnion();
+
+    u2.read(proto);
+
+    assertEquals(u2, union);
+
+    StructWithAUnion swau = new StructWithAUnion(u2);
+
+    buf = new TMemoryBuffer(0);
+    proto = new TBinaryProtocol(buf);
+
+    swau.write(proto);
+
+    StructWithAUnion swau2 = new StructWithAUnion();
+    assertFalse(swau2.equals(swau));
+    swau2.read(proto);
+    assertEquals(swau2, swau);
+
+    // this should NOT throw an exception.
+    buf = new TMemoryBuffer(0);
+    proto = new TBinaryProtocol(buf);
+
+    swau.write(proto);
+    new Empty().read(proto);
+  }
+
+  public void testSkip() throws Exception {
+    TestUnion tu = TestUnion.string_field("string");
+    byte[] tuSerialized = new TSerializer().serialize(tu);
+    TestUnionMinusStringField tums = new TestUnionMinusStringField();
+    new TDeserializer().deserialize(tums, tuSerialized);
+    assertNull(tums.getSetField());
+    assertNull(tums.getFieldValue());
+  }
+}
diff --git a/lib/java/test/org/apache/thrift/test/UnionTest.java b/lib/java/test/org/apache/thrift/test/UnionTest.java
deleted file mode 100644
index e17b24a..0000000
--- a/lib/java/test/org/apache/thrift/test/UnionTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.thrift.test;
-
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TSerializer;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-import thrift.test.ComparableUnion;
-import thrift.test.Empty;
-import thrift.test.SomeEnum;
-import thrift.test.StructWithAUnion;
-import thrift.test.TestUnion;
-import thrift.test.TestUnionMinusStringField;
-
-public class UnionTest {
-
-  /**
-   * @param args
-   */
-  public static void main(String[] args) throws Exception {
-    testBasic();
-    testEquality();
-    testSerialization();
-    testCompareTo();
-    testSkip();
-  }
-
-  public static void testBasic() throws Exception {
-    TestUnion union = new TestUnion();
-
-    if (union.isSet()) {
-      throw new RuntimeException("new union with default constructor counts as set!");
-    }
-
-    if (union.getFieldValue() != null) {
-      throw new RuntimeException("unset union didn't return null for value");
-    }
-
-    union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
-
-    if ((Integer)union.getFieldValue() != 25) {
-      throw new RuntimeException("set i32 field didn't come out as planned");
-    }
-
-    if ((Integer)union.getFieldValue(TestUnion._Fields.I32_FIELD) != 25) {
-      throw new RuntimeException("set i32 field didn't come out of TBase getFieldValue");
-    }
-
-    try {
-      union.getFieldValue(TestUnion._Fields.STRING_FIELD);
-      throw new RuntimeException("was expecting an exception around wrong set field");
-    } catch (IllegalArgumentException e) {
-      // cool!
-    }
-
-    System.out.println(union);
-
-    union = new TestUnion();
-
-    // should not throw an exception here
-    union.hashCode();
-
-    union.setI32_field(1);
-    if (union.getI32_field() != 1) {
-      throw new RuntimeException("didn't get the right value for i32 field!");
-    }
-    union.hashCode();
-
-    try {
-      union.getString_field();
-      throw new RuntimeException("should have gotten an exception");
-    } catch (Exception e) {
-      // sweet
-    }
-
-    union = TestUnion.i32_field(1);
-    
-    if (union.equals((TestUnion)null)) {
-      throw new RuntimeException("uh oh, union.equals(null)!");
-    }
-
-    union = TestUnion.enum_field(SomeEnum.ONE);
-    union.hashCode();
-
-    union = new TestUnion();
-    // should not throw an exception
-    union.toString();
-  }
-
-
-  public static void testEquality() throws Exception {
-    TestUnion union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
-
-    TestUnion otherUnion = new TestUnion(TestUnion._Fields.STRING_FIELD, "blah!!!");
-
-    if (union.equals(otherUnion)) {
-      throw new RuntimeException("shouldn't be equal");
-    }
-
-    otherUnion = new TestUnion(TestUnion._Fields.I32_FIELD, 400);
-
-    if (union.equals(otherUnion)) {
-      throw new RuntimeException("shouldn't be equal");
-    }
-
-    otherUnion = new TestUnion(TestUnion._Fields.OTHER_I32_FIELD, 25);
-
-    if (union.equals(otherUnion)) {
-      throw new RuntimeException("shouldn't be equal");
-    }
-  }
-
-
-  public static void testSerialization() throws Exception {
-    TestUnion union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
-
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = new TBinaryProtocol(buf);
-
-    union.write(proto);
-
-    TestUnion u2 = new TestUnion();
-
-    u2.read(proto);
-
-    if (!u2.equals(union)) {
-      throw new RuntimeException("serialization fails!");
-    }
-
-    StructWithAUnion swau = new StructWithAUnion(u2);
-
-    buf = new TMemoryBuffer(0);
-    proto = new TBinaryProtocol(buf);
-
-    swau.write(proto);
-
-    StructWithAUnion swau2 = new StructWithAUnion();
-    if (swau2.equals(swau)) {
-      throw new RuntimeException("objects match before they are supposed to!");
-    }
-    swau2.read(proto);
-    if (!swau2.equals(swau)) {
-      throw new RuntimeException("objects don't match when they are supposed to!");
-    }
-
-    // this should NOT throw an exception.
-    buf = new TMemoryBuffer(0);
-    proto = new TBinaryProtocol(buf);
-
-    swau.write(proto);
-    new Empty().read(proto);
-  }
-  
-  public static void testCompareTo() throws Exception {
-    ComparableUnion cu = ComparableUnion.string_field("a");
-    ComparableUnion cu2 = ComparableUnion.string_field("b");
-
-    if (cu.compareTo(cu2) != -1) {
-      throw new RuntimeException("a was supposed to be < b, but was " + cu.compareTo(cu2));
-    }
-
-    if (cu2.compareTo(cu) != 1) {
-      throw new RuntimeException("b was supposed to be > a, but was " + cu2.compareTo(cu));
-    }
-
-    cu2 = ComparableUnion.binary_field(new byte[]{2});
-
-    if (cu.compareTo(cu2) != -1) {
-      throw new RuntimeException("a was supposed to be < b, but was " + cu.compareTo(cu2));
-    }
-
-    if (cu2.compareTo(cu) != 1) {
-      throw new RuntimeException("b was supposed to be > a, but was " + cu2.compareTo(cu));
-    }
-
-    cu = ComparableUnion.binary_field(new byte[]{1});
-
-    if (cu.compareTo(cu2) != -1) {
-      throw new RuntimeException("a was supposed to be < b, but was " + cu.compareTo(cu2));
-    }
-
-    if (cu2.compareTo(cu) != 1) {
-      throw new RuntimeException("b was supposed to be > a, but was " + cu2.compareTo(cu));
-    }
-  }
-
-  public static void testSkip() throws Exception {
-    TestUnion tu = TestUnion.string_field("string");
-    byte[] tuSerialized = new TSerializer().serialize(tu);
-    TestUnionMinusStringField tums = new TestUnionMinusStringField();
-    new TDeserializer().deserialize(tums, tuSerialized);
-    if (tums.getSetField() != null) {
-      throw new RuntimeException("Expected tums to be unset!");
-    }
-    if (tums.getFieldValue() != null) {
-      throw new RuntimeException("Expected tums to have null value!");
-    }
-  }
-}