diff --git a/cpp/src/gandiva/gdv_function_stubs.cc b/cpp/src/gandiva/gdv_function_stubs.cc
index 67f3858865d9b..832eebcaa1a77 100644
--- a/cpp/src/gandiva/gdv_function_stubs.cc
+++ b/cpp/src/gandiva/gdv_function_stubs.cc
@@ -24,8 +24,8 @@
 #include "arrow/util/value_parsing.h"
 #include "gandiva/engine.h"
 #include "gandiva/exported_funcs.h"
-#include "gandiva/hash_utils.h"
 #include "gandiva/formatting_utils.h"
+#include "gandiva/hash_utils.h"
 #include "gandiva/in_holder.h"
 #include "gandiva/like_holder.h"
 #include "gandiva/precompiled/types.h"
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java
index d0c5650a3ec46..606c1a922e59f 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java
@@ -2046,6 +2046,7 @@ public void testEvaluateWithUnsetTargetHostCPU() throws Exception {
     eval.close();
   }  
 
+  @Test
   public void testCastVarcharFromInteger() throws Exception {
     Field inField = Field.nullable("input", int32);
     Field lenField = Field.nullable("outLength", int64);