diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
index 139fe7dffe2c9..75604f9a39a24 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
@@ -177,16 +177,16 @@ class DatasetSuite extends QueryTest with SharedSQLContext {
   test("joinWith, expression condition, outer join") {
     val nullInteger = null.asInstanceOf[Integer]
     val nullString = null.asInstanceOf[String]
-    val ds1 = Seq(ClassData("a", new Integer(1)),
-      ClassData("c", new Integer(3))).toDS()
+    val ds1 = Seq(ClassNullableData("a", new Integer(1)),
+      ClassNullableData("c", new Integer(3))).toDS()
     val ds2 = Seq(("a", new Integer(1)),
       ("b", new Integer(2))).toDS()
 
     checkAnswer(
       ds1.joinWith(ds2, $"_1" === $"a", "outer"),
-      (ClassData("a", new Integer(1)), ("a", new Integer(1))),
-      (ClassData("c", new Integer(3)), (nullString, nullInteger)),
-      (ClassData(nullString, nullInteger), ("b", new Integer(2))))
+      (ClassNullableData("a", new Integer(1)), ("a", new Integer(1))),
+      (ClassNullableData("c", new Integer(3)), (nullString, nullInteger)),
+      (ClassNullableData(nullString, nullInteger), ("b", new Integer(2))))
   }
 
   test("joinWith tuple with primitive, expression") {
@@ -418,7 +418,8 @@ class DatasetSuite extends QueryTest with SharedSQLContext {
 }
 
 
-case class ClassData(a: String, b: Integer)
+case class ClassData(a: String, b: Int)
+case class ClassNullableData(a: String, b: Integer)
 
 /**
  * A class used to test serialization using encoders. This class throws exceptions when using