diff --git a/tests/cpp/test_utils.h b/tests/cpp/include/test_ndarray_utils.h
similarity index 100%
rename from tests/cpp/test_utils.h
rename to tests/cpp/include/test_ndarray_utils.h
diff --git a/tests/cpp/operator/batchnorm_test.cc b/tests/cpp/operator/batchnorm_test.cc
index cabddec7b83e..b30fd0d30b9b 100644
--- a/tests/cpp/operator/batchnorm_test.cc
+++ b/tests/cpp/operator/batchnorm_test.cc
@@ -1,7 +1,7 @@
 /*!
  * Copyright (c) 2017 by Contributors
  * \file batchnorm_test.cc
- * \brief operator unit test utility functions
+ * \brief batchnorm operator unit test utility functions
  * \author Chris Olivier
 */
 
@@ -865,8 +865,8 @@ TEST(BATCH_NORM, TestIterAll) {
           kwargs.push_back({ "cudnn_off", "True" });
         }
         for (TShape shape : shapes) {
-          for (int g1 = 0; g1 < 2U; ++g1) {
-            for (int g2 = 0; g2 < 2U; ++g2) {
+          for (int g1 = 0; g1 < 2; ++g1) {
+            for (int g2 = 0; g2 < 2; ++g2) {
               for (int type : v2_types) {
                 MSHADOW_REAL_TYPE_SWITCH_EX(
                   type, DType, AccReal,
diff --git a/tests/cpp/ndarray_test.cc b/tests/cpp/operator/ndarray_test.cc
similarity index 99%
rename from tests/cpp/ndarray_test.cc
rename to tests/cpp/operator/ndarray_test.cc
index 16263ce960dd..d8658efc1aa1 100644
--- a/tests/cpp/ndarray_test.cc
+++ b/tests/cpp/operator/ndarray_test.cc
@@ -18,7 +18,7 @@
 #include "../src/operator/tensor/indexing_op.h"
 #include "../src/operator/optimizer_op-inl.h"
 #include "../src/operator/tensor/init_op.h"
-#include "test_utils.h"
+#include "test_ndarray_utils.h"
 
 using namespace mxnet;
 // Conversion Tests