diff --git a/.travis.yml b/.travis.yml
index 4e945266..5e6394fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ before_install:
 
 matrix:
   include:
-    - jdk: openjdk7
+# JDK 7 no longer supported by Gradle 6+
+#    - jdk: openjdk7
     - jdk: oraclejdk8 # JDK 1.8.0_131-b11
     - jdk: oraclejdk9
 
diff --git a/api/build.gradle b/api/build.gradle
index f8fd005f..42f65540 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -19,7 +19,13 @@ sourceSets {
 }
 
 jar {
-    manifest {
-        attributes('Automatic-Module-Name': 'org.reactivestreams')
-    }
+    bnd ('Bundle-Name': 'reactive-streams-jvm',
+            'Bundle-Vendor': 'Reactive Streams SIG',
+            'Bundle-Description': 'Reactive Streams API',
+            'Bundle-DocURL': 'http://reactive-streams.org',
+            'Bundle-Version': project.version,
+            'Export-Package': 'org.reactivestreams.*',
+            'Automatic-Module-Name': 'org.reactivestreams'
+    )
 }
+
diff --git a/build.gradle b/build.gradle
index 9454d59b..1ba055fd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,19 @@
+buildscript {
+    repositories { 
+        jcenter()
+        mavenCentral()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.1"
+    }
+}
+
 subprojects {
-    apply plugin: "java"
-    apply plugin: "osgi"
+    apply plugin: "java-library"
+    apply plugin: 'biz.aQute.bnd.builder'
 
     group = "org.reactivestreams"
     version = "1.0.3"
@@ -36,16 +49,6 @@ subprojects {
         mavenCentral()
     }
 
-
-    jar {
-        manifest {
-            instructionReplace "Bundle-Vendor", "Reactive Streams SIG"
-            instructionReplace "Bundle-Description", "Reactive Streams API"
-            instructionReplace "Bundle-DocURL", "http://reactive-streams.org"
-            instructionReplace "Bundle-Version", "1.0.3"
-        }
-    }
-
     if (name in ["reactive-streams",
                  "reactive-streams-tck",
                  "reactive-streams-tck-flow",
diff --git a/examples/build.gradle b/examples/build.gradle
index 5258a5f1..c04398ef 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1,13 +1,18 @@
 description = 'reactive-streams-examples'
 dependencies {
-    compile project(':reactive-streams')
-    testCompile project(':reactive-streams-tck')
+    implementation project(':reactive-streams')
+    testImplementation project(':reactive-streams-tck')
 }
 
 jar {
-    manifest {
-        attributes('Automatic-Module-Name': 'org.reactivestreams.examples')
-    }
+    bnd ('Bundle-Name': 'reactive-streams-jvm',
+            'Bundle-Vendor': 'Reactive Streams SIG',
+            'Bundle-Description': 'Reactive Streams Examples',
+            'Bundle-DocURL': 'http://reactive-streams.org',
+            'Bundle-Version': project.version,
+            'Export-Package': 'org.reactivestreams.example.*',
+            'Automatic-Module-Name': 'org.reactivestreams.examples'
+    )
 }
 
 test.useTestNG()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 27768f1b..94336fca 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1d5b29fb..94920145 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
diff --git a/tck-flow/build.gradle b/tck-flow/build.gradle
index bf661453..95a72f1e 100644
--- a/tck-flow/build.gradle
+++ b/tck-flow/build.gradle
@@ -1,13 +1,18 @@
 description = 'reactive-streams-tck-flow'
 dependencies {
-    compile group: 'org.testng', name: 'testng', version:'5.14.10'
-    compile project(':reactive-streams-tck')
+    api project(':reactive-streams-tck')
+    implementation project(':reactive-streams-examples')
 }
 
 jar {
-    manifest {
-        attributes('Automatic-Module-Name': 'org.reactivestreams.tckflow')
-    }
+    bnd ('Bundle-Name': 'reactive-streams-jvm',
+            'Bundle-Vendor': 'Reactive Streams SIG',
+            'Bundle-Description': 'Reactive Streams TCK Flow',
+            'Bundle-DocURL': 'http://reactive-streams.org',
+            'Bundle-Version': project.version,
+            'Export-Package': 'org.reactivestreams.tck.flow.*',
+            'Automatic-Module-Name': 'org.reactivestreams.tckflow'
+    )
 }
 
 test.useTestNG()
diff --git a/tck-flow/src/test/java/org/reactivestreams/tck/flow/SyncTriggeredDemandSubscriberTest.java b/tck-flow/src/test/java/org/reactivestreams/tck/flow/SyncTriggeredDemandSubscriberTest.java
index e9fa620b..82c824fe 100644
--- a/tck-flow/src/test/java/org/reactivestreams/tck/flow/SyncTriggeredDemandSubscriberTest.java
+++ b/tck-flow/src/test/java/org/reactivestreams/tck/flow/SyncTriggeredDemandSubscriberTest.java
@@ -33,6 +33,7 @@ public SyncTriggeredDemandSubscriberTest() {
     super(new TestEnvironment());
   }
 
+  @Test(enabled = false)
   @Override
   public void triggerFlowRequest(Flow.Subscriber<? super Integer> subscriber) {
     ((SyncTriggeredDemandFlowSubscriber<? super Integer>) subscriber).triggerDemand(1);
diff --git a/tck/build.gradle b/tck/build.gradle
index 4ce22c8f..dc9697cd 100644
--- a/tck/build.gradle
+++ b/tck/build.gradle
@@ -1,14 +1,19 @@
 description = 'reactive-streams-tck'
 dependencies {
-    compile group: 'org.testng', name: 'testng', version:'5.14.10'
-    compile project(':reactive-streams')
-    compile project(':reactive-streams-examples')
+    api group: 'org.testng', name: 'testng', version:'7.0.0'
+    api project(':reactive-streams')
+    implementation project(':reactive-streams-examples')
 }
 
 jar {
-    manifest {
-        attributes('Automatic-Module-Name': 'org.reactivestreams.tck')
-    }
+    bnd ('Bundle-Name': 'reactive-streams-jvm',
+            'Bundle-Vendor': 'Reactive Streams SIG',
+            'Bundle-Description': 'Reactive Streams TCK',
+            'Bundle-DocURL': 'http://reactive-streams.org',
+            'Bundle-Version': project.version,
+            'Export-Package': 'org.reactivestreams.tck.*',
+            'Automatic-Module-Name': 'org.reactivestreams.tck'
+    )
 }
 
 test.useTestNG()
diff --git a/tck/src/test/java/org/reactivestreams/tck/SyncTriggeredDemandSubscriberTest.java b/tck/src/test/java/org/reactivestreams/tck/SyncTriggeredDemandSubscriberTest.java
index 88ba57e3..d998829c 100644
--- a/tck/src/test/java/org/reactivestreams/tck/SyncTriggeredDemandSubscriberTest.java
+++ b/tck/src/test/java/org/reactivestreams/tck/SyncTriggeredDemandSubscriberTest.java
@@ -11,15 +11,11 @@
 
 package org.reactivestreams.tck;
 
-import org.reactivestreams.Subscriber;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import java.util.concurrent.*;
 
+import org.reactivestreams.Subscriber;
 import org.reactivestreams.tck.flow.support.SyncTriggeredDemandSubscriber;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import org.testng.annotations.*;
 
 @Test // Must be here for TestNG to find and run this, do not remove
 public class SyncTriggeredDemandSubscriberTest extends SubscriberBlackboxVerification<Integer> {
@@ -32,6 +28,7 @@ public SyncTriggeredDemandSubscriberTest() {
     super(new TestEnvironment());
   }
 
+  @Test(enabled = false) // TestNG tries to inject here but this is a helper method
   @Override public void triggerRequest(final Subscriber<? super Integer> subscriber) {
     ((SyncTriggeredDemandSubscriber<? super Integer>)subscriber).triggerDemand(1);
   }