diff --git a/opentracing-rxjava-1/src/test/java/io/opentracing/rxjava/TracingSubscriberTest.java b/opentracing-rxjava-1/src/test/java/io/opentracing/rxjava/TracingSubscriberTest.java
index 2dfebb8..6c1aa5c 100644
--- a/opentracing-rxjava-1/src/test/java/io/opentracing/rxjava/TracingSubscriberTest.java
+++ b/opentracing-rxjava-1/src/test/java/io/opentracing/rxjava/TracingSubscriberTest.java
@@ -28,7 +28,6 @@
 import io.opentracing.Scope;
 import io.opentracing.mock.MockSpan;
 import io.opentracing.mock.MockTracer;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
@@ -76,15 +75,16 @@ public void two_sequential() {
 
   @Test
   public void sequential_with_parent() {
-    try (Scope ignored = mockTracer.buildSpan("parent").startActive(true)) {
+    final MockSpan parent = mockTracer.buildSpan("parent").start();
+    try (Scope ignored = mockTracer.activateSpan(parent)) {
       executeSequentialObservable("sequential_with_parent first");
       executeSequentialObservable("sequential_with_parent second");
     }
+    parent.finish();
 
     List<MockSpan> spans = mockTracer.finishedSpans();
     assertEquals(3, spans.size());
 
-    MockSpan parent = getOneSpanByOperationName(spans, "parent");
     assertNotNull(parent);
 
     for (MockSpan span : spans) {
@@ -140,17 +140,17 @@ public void two_parallel() {
 
   @Test
   public void parallel_with_parent() {
-    try (Scope ignored = mockTracer.buildSpan("parallel_parent")
-        .startActive(true)) {
+    final MockSpan parent = mockTracer.buildSpan("parallel_parent").start();
+    try (Scope ignored = mockTracer.activateSpan(parent)) {
       executeParallelObservable("first_parallel_with_parent");
       executeParallelObservable("second_parallel_with_parent");
     }
+    parent.finish();
 
     await().atMost(15, TimeUnit.SECONDS).until(reportedSpansSize(mockTracer), equalTo(3));
     List<MockSpan> spans = mockTracer.finishedSpans();
     assertEquals(3, spans.size());
 
-    MockSpan parent = getOneSpanByOperationName(spans, "parallel_parent");
     assertNotNull(parent);
 
     for (MockSpan span : spans) {
@@ -176,20 +176,6 @@ private void executeParallelObservable(final String name) {
     observable.subscribe(new TracingSubscriber<>(subscriber, "parallel", mockTracer));
   }
 
-  private MockSpan getOneSpanByOperationName(List<MockSpan> spans, String operationName) {
-    List<MockSpan> found = new ArrayList<>();
-    for (MockSpan span : spans) {
-      if (operationName.equals(span.operationName())) {
-        found.add(span);
-      }
-    }
-    if (found.size() > 1) {
-      throw new RuntimeException(
-          "Ups, too many spans (" + found.size() + ") with operation name " + operationName);
-    }
-    return found.isEmpty() ? null : spans.get(0);
-  }
-
   private static <T> Subscriber<T> subscriber(final String name) {
     return new Subscriber<T>() {
 
diff --git a/opentracing-rxjava-1/src/test/java/io/opentracing/rxjava/TracingTest.java b/opentracing-rxjava-1/src/test/java/io/opentracing/rxjava/TracingTest.java
index 304d37d..d2e63cc 100644
--- a/opentracing-rxjava-1/src/test/java/io/opentracing/rxjava/TracingTest.java
+++ b/opentracing-rxjava-1/src/test/java/io/opentracing/rxjava/TracingTest.java
@@ -96,7 +96,8 @@ public void call(Integer integer) {
   @Test
   public void traced_with_parent() {
 
-    Scope scope = mockTracer.buildSpan("parent").startActive(true);
+    final MockSpan parent = mockTracer.buildSpan("parent").start();
+    Scope scope = mockTracer.activateSpan(parent);
 
     Observable<Integer> ob = Observable.range(1, 10)
         .observeOn(Schedulers.io())
@@ -130,6 +131,7 @@ public void call(Integer integer) {
     ob.subscribe(new TracingActionSubscriber<>(action1, "test2", mockTracer));
 
     scope.close();
+    parent.finish();
 
     await().atMost(15, TimeUnit.SECONDS).until(reportedSpansSize(mockTracer), equalTo(3));
 
@@ -215,11 +217,13 @@ public void call(Integer integer) {
       }
     };
 
-    final Scope scope = mockTracer.buildSpan("parent").startActive(true);
+    final MockSpan parent = mockTracer.buildSpan("parent").start();
+    final Scope scope = mockTracer.activateSpan(parent);
     ob.subscribe(action1);
 
     latch.await(10, TimeUnit.SECONDS);
     scope.close();
+    parent.finish();
 
     await().atMost(15, TimeUnit.SECONDS).until(reportedSpansSize(mockTracer), equalTo(1));
     List<MockSpan> spans = mockTracer.finishedSpans();
diff --git a/opentracing-rxjava-2/pom.xml b/opentracing-rxjava-2/pom.xml
index 662baf5..de34d5b 100644
--- a/opentracing-rxjava-2/pom.xml
+++ b/opentracing-rxjava-2/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>io.reactivex.rxjava2</groupId>
       <artifactId>rxjava</artifactId>
-      <version>2.2.8</version>
+      <version>2.2.11</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/opentracing-rxjava-2/src/test/java/io/opentracing/rxjava2/TracingObserverTest.java b/opentracing-rxjava-2/src/test/java/io/opentracing/rxjava2/TracingObserverTest.java
index e671774..41a5d24 100644
--- a/opentracing-rxjava-2/src/test/java/io/opentracing/rxjava2/TracingObserverTest.java
+++ b/opentracing-rxjava-2/src/test/java/io/opentracing/rxjava2/TracingObserverTest.java
@@ -81,17 +81,18 @@ public void two_sequential() {
   @Test
   public void sequential_with_parent() {
     List<Integer> result = new ArrayList<>();
-    try (Scope ignored = mockTracer.buildSpan("parent").startActive(true)) {
+    final MockSpan parent = mockTracer.buildSpan("parent").start();
+    try (Scope ignored = mockTracer.activateSpan(parent)) {
       executeSequentialObservable("sequential_with_parent first", result);
       executeSequentialObservable("sequential_with_parent second", result);
     }
+    parent.finish();
 
     assertEquals(10, result.size());
 
     List<MockSpan> spans = mockTracer.finishedSpans();
     assertEquals(3, spans.size());
 
-    MockSpan parent = getOneSpanByOperationName(spans, "parent");
     assertNotNull(parent);
 
     for (MockSpan span : spans) {
@@ -138,10 +139,12 @@ public void two_parallel() {
   @Test
   public void parallel_with_parent() {
     List<Integer> result = new CopyOnWriteArrayList<>();
-    try (Scope ignored = mockTracer.buildSpan("parallel_parent").startActive(true)) {
+    final MockSpan parent = mockTracer.buildSpan("parallel_parent").start();
+    try (Scope ignored = mockTracer.activateSpan(parent)) {
       executeParallelObservable("first_parallel_with_parent", result);
       executeParallelObservable("second_parallel_with_parent", result);
     }
+    parent.finish();
 
     await().atMost(15, TimeUnit.SECONDS).until(reportedSpansSize(mockTracer), equalTo(3));
 
@@ -150,7 +153,6 @@ public void parallel_with_parent() {
     List<MockSpan> spans = mockTracer.finishedSpans();
     assertEquals(3, spans.size());
 
-    MockSpan parent = getOneSpanByOperationName(spans, "parallel_parent");
     assertNotNull(parent);
 
     for (MockSpan span : spans) {
@@ -202,17 +204,4 @@ public void onComplete() {
     };
   }
 
-  private MockSpan getOneSpanByOperationName(List<MockSpan> spans, String operationName) {
-    List<MockSpan> found = new ArrayList<>();
-    for (MockSpan span : spans) {
-      if (operationName.equals(span.operationName())) {
-        found.add(span);
-      }
-    }
-    if (found.size() > 1) {
-      throw new RuntimeException(
-          "Ups, too many spans (" + found.size() + ") with operation name " + operationName);
-    }
-    return found.isEmpty() ? null : spans.get(0);
-  }
 }
diff --git a/pom.xml b/pom.xml
index 5a9890b..a266c35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,9 +61,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 
-    <opentracing.version>0.32.0</opentracing.version>
+    <opentracing.version>0.33.0</opentracing.version>
     <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
-    <jacoco-maven-plugin.version>0.8.3</jacoco-maven-plugin.version>
+    <jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
   </properties>
 
   <modules>
@@ -117,7 +117,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.8.1</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
@@ -136,7 +136,7 @@
       <plugin>
         <groupId>io.zipkin.centralsync-maven-plugin</groupId>
         <artifactId>centralsync-maven-plugin</artifactId>
-        <version>0.1.0</version>
+        <version>0.1.1</version>
         <configuration>
           <subject>opentracing</subject>
           <repo>maven</repo>
@@ -200,7 +200,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -214,7 +214,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
             <configuration>
               <failOnError>false</failOnError>
             </configuration>