diff --git a/build.sbt b/build.sbt
index 5dc80868b2..fca9fc630c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -586,16 +586,8 @@ val protocJavaSourceManaged =
 val protocGrpcSourceManaged =
   settingKey[File]("Default directory for gRPC sources generated by protoc.")
 
-lazy val protobufConfigSettings = Def.settings(
-  PB.protocVersion := gcpBom.key.value.version("com.google.protobuf" % "protobuf-java"),
-  PB.targets := Seq(
-    PB.gens.java(PB.protocVersion.value) -> Defaults.configSrcSub(protocJavaSourceManaged).value,
-    PB.gens.plugin("grpc-java") -> Defaults.configSrcSub(protocGrpcSourceManaged).value
-  ),
-  managedSourceDirectories ++= PB.targets.value.map(_.outputPath)
-)
-
 lazy val protobufSettings = Def.settings(
+  PB.protocVersion := gcpBom.key.value.version("com.google.protobuf" % "protobuf-java"),
   protocJavaSourceManaged := sourceManaged.value / "compiled_proto",
   protocGrpcSourceManaged := sourceManaged.value / "compiled_grpc",
   libraryDependencies ++= Seq(
@@ -605,6 +597,14 @@ lazy val protobufSettings = Def.settings(
   )
 ) ++ Seq(Compile, Test).flatMap(c => inConfig(c)(protobufConfigSettings))
 
+lazy val protobufConfigSettings = Def.settings(
+  PB.targets := Seq(
+    PB.gens.java(PB.protocVersion.value) -> Defaults.configSrcSub(protocJavaSourceManaged).value,
+    PB.gens.plugin("grpc-java") -> Defaults.configSrcSub(protocGrpcSourceManaged).value
+  ),
+  managedSourceDirectories ++= PB.targets.value.map(_.outputPath)
+)
+
 def splitTests(tests: Seq[TestDefinition], filter: Seq[String], forkOptions: ForkOptions) = {
   val (filtered, default) = tests.partition(test => filter.contains(test.name))
   val policy = Tests.SubProcess(forkOptions)