diff --git a/orca-integrations-cloudfoundry/orca-integrations-cloudfoundry.gradle b/orca-integrations-cloudfoundry/orca-integrations-cloudfoundry.gradle
new file mode 100644
index 0000000000..9ee776ca55
--- /dev/null
+++ b/orca-integrations-cloudfoundry/orca-integrations-cloudfoundry.gradle
@@ -0,0 +1,15 @@
+test {
+  useJUnitPlatform()
+}
+
+dependencies {
+  compileOnly spinnaker.dependency("lombok")
+  annotationProcessor spinnaker.dependency("lombok")
+
+  compile project(":orca-core")
+
+  testCompile spinnaker.dependency("junitJupiterApi")
+  testCompile spinnaker.dependency("assertj")
+
+  testRuntime spinnaker.dependency("junitJupiterEngine")
+}
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/expressions/functions/ServiceKeyExpressionFunctionProvider.java b/orca-integrations-cloudfoundry/src/main/java/com/netflix/spinnaker/orca/pipeline/expressions/functions/ServiceKeyExpressionFunctionProvider.java
similarity index 100%
rename from orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/expressions/functions/ServiceKeyExpressionFunctionProvider.java
rename to orca-integrations-cloudfoundry/src/main/java/com/netflix/spinnaker/orca/pipeline/expressions/functions/ServiceKeyExpressionFunctionProvider.java
diff --git a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/expressions/functions/ServiceKeyExpressionFunctionProviderTest.java b/orca-integrations-cloudfoundry/src/test/java/com/netflix/spinnaker/orca/pipeline/expressions/functions/ServiceKeyExpressionFunctionProviderTest.java
similarity index 100%
rename from orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/expressions/functions/ServiceKeyExpressionFunctionProviderTest.java
rename to orca-integrations-cloudfoundry/src/test/java/com/netflix/spinnaker/orca/pipeline/expressions/functions/ServiceKeyExpressionFunctionProviderTest.java
diff --git a/settings.gradle b/settings.gradle
index 6f5d04a521..1d4600e9a1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -47,7 +47,8 @@ include "orca-extensionpoint",
   "orca-migration",
   "orca-sql",
   "orca-sql-mysql",
-  "orca-integrations-gremlin"
+  "orca-integrations-gremlin",
+  "orca-integrations-cloudfoundry"
 
 rootProject.name = "orca"