diff --git a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
index 85f368b65e..8c5e1861f4 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
@@ -19,7 +19,6 @@ UPDATE_GOLDENS_TESTS = [
 
 TESTS = UPDATE_GOLDENS_TESTS + [
     "RetrySettingsComposerTest",
-    "ServiceClientSampleCodeComposerTest",
 ]
 
 TEST_DEPS = [
@@ -38,6 +37,7 @@ TEST_DEPS = [
     "//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto",
     "//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto",
     "//src/test/java/com/google/api/generator/gapic/composer/constants",
+    "@com_google_api_api_common//jar",
     "@com_google_api_gax_java//gax",
     "@com_google_api_api_common",
     "@com_google_googleapis//google/logging/v2:logging_java_proto",
diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/samplecode/BUILD.bazel
index 963b826dae..f5135007ec 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/BUILD.bazel
@@ -5,6 +5,7 @@ package(default_visibility = ["//visibility:public"])
 TESTS = [
     "SampleCodeJavaFormatterTest",
     "SampleCodeWriterTest",
+    "ServiceClientSampleCodeComposerTest",
 ]
 
 filegroup(
@@ -21,8 +22,13 @@ filegroup(
         "//src/main/java/com/google/api/generator/engine/writer",
         "//src/main/java/com/google/api/generator/gapic/composer/samplecode",
         "//src/main/java/com/google/api/generator/gapic/model",
+        "//src/main/java/com/google/api/generator/gapic/protoparser",
+        "//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto",
         "//src/test/java/com/google/api/generator/testutils",
+        "@com_google_api_api_common//jar",
         "@com_google_api_gax_java//gax",
+        "@com_google_googleapis//google/rpc:rpc_java_proto",
+        "@com_google_protobuf//:protobuf_java",
         "@com_google_truth_truth//jar",
         "@junit_junit//jar",
     ],
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientSampleCodeComposerTest.java
similarity index 99%
rename from src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java
rename to src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientSampleCodeComposerTest.java
index 1cb575fa3c..0fc7c33c67 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientSampleCodeComposerTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.api.generator.gapic.composer;
+package com.google.api.generator.gapic.composer.samplecode;
 
 import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;