diff --git a/mantis-common/build.gradle b/mantis-common/build.gradle
index d7e83080b..37b11f867 100644
--- a/mantis-common/build.gradle
+++ b/mantis-common/build.gradle
@@ -30,14 +30,12 @@ dependencies {
     api "org.xerial.snappy:snappy-java:$snappyVersion"
     api "org.jctools:jctools-core:$jctoolsVersion"
 
-    // spectatorApi should be packaged at entry point level to avoid version conflicts.
-    compileOnly libraries.spectatorApi
-
     api libraries.mantisShaded
     api libraries.rxNettyShaded
     api libraries.rxJava
     api libraries.slf4jApi
     api libraries.slf4jLog4j12
+    implementation libraries.spectatorApi
     implementation libraries.commonsIo
     implementation 'net.jcip:jcip-annotations:1.0'
 
diff --git a/mantis-runtime/build.gradle b/mantis-runtime/build.gradle
index f66ff3066..b836028f2 100644
--- a/mantis-runtime/build.gradle
+++ b/mantis-runtime/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     api project(':mantis-common')
     api libraries.slf4jApi
     compileOnly libraries.jsr305
-    compileOnly libraries.spectatorApi
+    implementation libraries.spectatorApi
     testImplementation libraries.spectatorApi
     testImplementation libraries.junit4
     testImplementation libraries.mockitoCore