diff --git a/.buckversion b/.buckversion
index a98eae96dbddc..d1eca2201fb0e 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-a3fb9f5012413a64beae7c6ad52db32cc4d6fe92
+df20478ef9136000d6a43b80a920adac0afd627a
diff --git a/java/client/test/org/openqa/selenium/BUCK b/java/client/test/org/openqa/selenium/BUCK
index 0fd5106a9086c..642863d292df9 100644
--- a/java/client/test/org/openqa/selenium/BUCK
+++ b/java/client/test/org/openqa/selenium/BUCK
@@ -1,4 +1,3 @@
-java_test(name = 'small-tests',
 java_test(name = 'small-tests',
   srcs = [
     'SmallTests.java',
diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK
index 2383f29a61d5a..c288050c9a47c 100644
--- a/java/server/src/org/openqa/selenium/remote/server/BUCK
+++ b/java/server/src/org/openqa/selenium/remote/server/BUCK
@@ -19,6 +19,7 @@ java_library(name = 'sessions',
 java_library(name = 'server',
   srcs = [
     'CapabilitiesComparator.java',
+    'Clock.java',
     'DefaultDriverFactory.java',
     'DefaultDriverProvider.java',
     'DefaultDriverSessions.java',
@@ -30,6 +31,7 @@ java_library(name = 'server',
     'JsonParametersAware.java',
     'SessionCleaner.java',
     'SnapshotScreenListener.java',
+    'SystemClock.java',
   ] + glob([
     'handler/**/*.java',
     'rest/*.java',