diff --git a/build.gradle b/build.gradle
index a24c4f0c03..13d0005dfa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,7 +98,7 @@ ext {
 		println "Context Propagation version defined from command line: ${forceContextPropagationVersion}"
 	}
 
-	braveVersion = '5.16.0'
+	braveVersion = '5.17.0'
 	zipkinSenderVersion = '2.16.3'
 
 	jsr305Version = '3.0.2'
diff --git a/reactor-netty-http-brave/build.gradle b/reactor-netty-http-brave/build.gradle
index 91d475f7f2..c02d72eb19 100644
--- a/reactor-netty-http-brave/build.gradle
+++ b/reactor-netty-http-brave/build.gradle
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2020-2023 VMware, Inc. or its affiliates, All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import me.champeau.gradle.japicmp.JapicmpTask
 
 /*
@@ -40,9 +55,10 @@ dependencies {
 	// JSR-305 annotations
 	testCompileOnly "com.google.code.findbugs:jsr305:$jsr305Version"
 
+	testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
 	testImplementation "io.zipkin.brave:brave-instrumentation-http-tests:$braveVersion"
 
-	testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junitVersion"
+	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
 	testRuntimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
 }
 
diff --git a/reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpClientDecoratorTest.java b/reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpClientDecoratorTest.java
index 810e1685e2..029532b4ae 100644
--- a/reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpClientDecoratorTest.java
+++ b/reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpClientDecoratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2020-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.util.concurrent.DefaultEventExecutor;
 import io.netty.util.concurrent.EventExecutor;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.netty.DisposableServer;
 import reactor.netty.http.client.HttpClient;
@@ -49,7 +49,7 @@ public class ITTracingHttpClientDecoratorTest extends ITHttpAsyncClient<HttpClie
 	private ChannelGroup group;
 	private static final EventExecutor executor = new DefaultEventExecutor();
 
-	@AfterClass
+	@AfterAll
 	public static void afterClass() throws Exception {
 		executor.shutdownGracefully()
 		        .get(5, TimeUnit.SECONDS);
diff --git a/reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpServerDecoratorTest.java b/reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpServerDecoratorTest.java
index 2514aa5958..8b909dc44a 100644
--- a/reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpServerDecoratorTest.java
+++ b/reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpServerDecoratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2020-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.util.concurrent.DefaultEventExecutor;
 import io.netty.util.concurrent.EventExecutor;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 import reactor.netty.DisposableServer;
@@ -41,13 +41,13 @@ public class ITTracingHttpServerDecoratorTest extends ITHttpServer {
 	private ChannelGroup group;
 	private static final EventExecutor executor = new DefaultEventExecutor();
 
-	@AfterClass
+	@AfterAll
 	public static void afterClass() throws Exception {
 		executor.shutdownGracefully()
 		        .get(5, TimeUnit.SECONDS);
 	}
 
-	@After
+	@AfterEach
 	@Override
 	public void close() throws Exception {
 		if (disposableServer != null) {
@@ -125,13 +125,13 @@ protected String url(String path) {
 	}
 
 	@Override
-	@Ignore
+	@Disabled
 	public void httpStatusCodeSettable_onUncaughtException() {
 		// Reactor Netty always returns 500 ISE when an exception happens
 	}
 
 	@Override
-	@Ignore
+	@Disabled
 	public void httpStatusCodeSettable_onUncaughtException_async() {
 		// Reactor Netty always returns 500 ISE when an exception happens
 	}