diff --git a/common/pom.xml b/common/pom.xml
index e71af9fbfb..124514b377 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -31,14 +31,13 @@
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
     </dependency>
-    <!-- XXX(gpe): must be before kotlin-test-junit5 so we get the correct version of junit-jupiter-api (ugh!) -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-test-junit5</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index c98a11b72c..8e2e32e800 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,12 @@
         <version>5.5.2</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>5.5.2</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>