diff --git a/tests/benchmark/ConvBench.cpp b/tests/benchmark/ConvBench.cpp
index 5b92cc3f1..6f59b3e48 100644
--- a/tests/benchmark/ConvBench.cpp
+++ b/tests/benchmark/ConvBench.cpp
@@ -99,8 +99,8 @@ class ConvBench : public Benchmark {
   virtual void run() override {
     // biasWDims isn't used in libjit_conv2d_f, so we're passing NULL.
     libjit_conv2d_f(outW.data(), inW.data(), filterW.data(), biasW.data(),
-                    outWdims, inWdims, filterWdims, NULL, kernelSizes, strides,
-                    pads, group, depthUnroll);
+                    outWdims, inWdims, filterWdims, nullptr, kernelSizes,
+                    strides, pads, group, depthUnroll);
   }
 
   virtual void teardown() override {}
diff --git a/tests/unittests/OCLTest.cpp b/tests/unittests/OCLTest.cpp
index 454a70d1b..c81a79470 100644
--- a/tests/unittests/OCLTest.cpp
+++ b/tests/unittests/OCLTest.cpp
@@ -155,14 +155,14 @@ class OpenCLCommandQueuePoolTest : public ::testing::Test {
   void SetUp() override {
     // Get an OpenCL platform ID.
     std::vector<cl_platform_id> platforms(1);
-    cl_int err = clGetPlatformIDs(1, platforms.data(), NULL);
+    cl_int err = clGetPlatformIDs(1, platforms.data(), nullptr);
     ASSERT_EQ(err, CL_SUCCESS) << "clGetPlatformIDs failed.";
 
     // Get an OpenCL device ID.
     cl_platform_id platform_id_used = platforms[0];
     std::vector<cl_device_id> devices(1);
     err = clGetDeviceIDs(platform_id_used, CL_DEVICE_TYPE_ALL, 1,
-                         devices.data(), NULL);
+                         devices.data(), nullptr);
     ASSERT_EQ(err, CL_SUCCESS) << "clGetDeviceIDs failed";
 
     // Create an OpenCL context.