diff --git a/pom.xml b/pom.xml
index 2b253ca58359b..594b2f4d1a1ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -885,8 +885,7 @@
       <dependency>
         <groupId>org.clapper</groupId>
         <artifactId>classutil_${scala.binary.version}</artifactId>
-        <version>1.5.0</version>
-        <scope>test</scope>
+        <version>1.5.1</version>
       </dependency>
       <dependency>
         <groupId>org.scalatest</groupId>
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml
index 9b2c8922d70aa..ab65e7f5cd3bf 100644
--- a/sql/catalyst/pom.xml
+++ b/sql/catalyst/pom.xml
@@ -120,6 +120,7 @@
     <dependency>
       <groupId>org.clapper</groupId>
       <artifactId>classutil_${scala.binary.version}</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
index dda3a27c3463a..0d815657109db 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
@@ -871,7 +871,7 @@ case class UnixTimestamp(timeExp: Expression, format: Expression, timeZoneId: Op
 }
 
 abstract class ToTimestamp
-  extends BinaryExpression with TimeZoneAwareExpression with ExpectsInputTypes with NullIntolerant {
+  extends BinaryExpression with TimeZoneAwareExpression with ExpectsInputTypes {
 
   // The result of the conversion to timestamp is microseconds divided by this factor.
   // For example if the factor is 1000000, the result of the expression is in seconds.
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/NullIntolerantCheckerSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/NullIntolerantCheckerSuite.scala
index d63d8e73d5225..1c38c467c649c 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/NullIntolerantCheckerSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/NullIntolerantCheckerSuite.scala
@@ -31,7 +31,6 @@ class NullIntolerantCheckerSuite extends SparkFunSuite {
   // Do not check these Expressions
   private val whiteList = List(
     classOf[IntegralDivide], classOf[Divide], classOf[Remainder], classOf[Pmod],
-    classOf[ToUnixTimestamp], classOf[GetTimestamp], classOf[UnixTimestamp],
     classOf[CheckOverflow], classOf[NormalizeNaNAndZero],
     classOf[InSet],
     classOf[PrintToStderr], classOf[CodegenFallbackExpression]).map(_.getName)
diff --git a/tools/pom.xml b/tools/pom.xml
index 6e806413ef261..a22bcd35371da 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -44,7 +44,6 @@
     <dependency>
       <groupId>org.clapper</groupId>
       <artifactId>classutil_${scala.binary.version}</artifactId>
-      <version>1.5.1</version>
     </dependency>
   </dependencies>