diff --git a/java/server/src/org/openqa/grid/selenium/BUCK b/java/server/src/org/openqa/grid/selenium/BUCK
index 52d11eafdefc8..8b30d1d6352af 100644
--- a/java/server/src/org/openqa/grid/selenium/BUCK
+++ b/java/server/src/org/openqa/grid/selenium/BUCK
@@ -18,6 +18,7 @@ java_library(name = 'classes',
     '//java/server/src/org/openqa/grid/shared:cli',
     '//java/server/src/org/openqa/grid/shared:interfaces',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
+    '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
     '//java/server/src/org/openqa/selenium/server:server',
     '//third_party/java/gson:gson',
     '//third_party/java/guava-libraries:guava-libraries',
diff --git a/java/server/src/org/openqa/grid/shared/BUCK b/java/server/src/org/openqa/grid/shared/BUCK
index 656f173d52205..4ba6251c1539b 100644
--- a/java/server/src/org/openqa/grid/shared/BUCK
+++ b/java/server/src/org/openqa/grid/shared/BUCK
@@ -15,5 +15,6 @@ java_library(name = 'interfaces',
     '//java/server/src/org/openqa/grid/common:common',
     '//java/server/src/org/openqa/grid/selenium:classes',
     '//java/server/src/org/openqa/selenium/server:server',
+    '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
   ],
 )
diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK
index ab6dbc7ac4ced..174551c9c4f39 100644
--- a/java/server/src/org/openqa/selenium/remote/server/BUCK
+++ b/java/server/src/org/openqa/selenium/remote/server/BUCK
@@ -88,10 +88,16 @@ java_library(name = 'standalone-server-lib',
   ],
   deps = [
     ':server',
+    ':sessions',
+    '//java/client/src/org/openqa/selenium/remote:api',
+    '//java/server/src/org/openqa/grid/shared:interfaces',
     '//third_party/java/beust:jcommander',
     '//third_party/java/jetty:jetty',
     '//third_party/java/servlet:servlet-api',
   ],
+  visibility = [
+    '//java/server/src/org/openqa/grid/selenium:classes',
+  ],
 )
 
 java_binary(name = 'standalone-server',