diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 437c368356d..6821ac7eb7f 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -3429,7 +3429,6 @@ tf_cc_tests(
         "platform/stacktrace_handler_test.cc",
         "platform/subprocess_test.cc",
         "platform/vmodule_benchmark_test.cc",
-        "platform/vmodule_test.cc",
     ],
     deps = [
         ":lib",
@@ -3443,6 +3442,20 @@ tf_cc_tests(
     ],
 )
 
+tf_cc_test(
+    name = "vmodule_test",
+    srcs = ["platform/vmodule_test.cc"],
+    tags = ["optonly"],
+    deps = [
+        ":lib",
+        ":lib_internal",
+        ":lib_test_internal",
+        ":protos_all_cc",
+        ":test",
+        "//third_party/eigen3",
+    ],
+)
+
 tf_cc_test(
     name = "lib_random_random_distributions_test",
     srcs = ["lib/random/random_distributions_test.cc"],