diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/jdbc/TraceJdbcAutoConfiguration.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/jdbc/TraceJdbcAutoConfiguration.java
index 80233866e..cb982be83 100644
--- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/jdbc/TraceJdbcAutoConfiguration.java
+++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/jdbc/TraceJdbcAutoConfiguration.java
@@ -27,6 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.sleuth.Tracer;
+import org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration;
 import org.springframework.cloud.sleuth.instrument.jdbc.DataSourceDecorator;
 import org.springframework.cloud.sleuth.instrument.jdbc.DataSourceNameResolver;
 import org.springframework.cloud.sleuth.instrument.jdbc.TraceHikariListenerStrategySpanCustomizer;
@@ -44,7 +45,7 @@ import org.springframework.context.annotation.Import;
 @EnableConfigurationProperties(TraceJdbcProperties.class)
 @ConditionalOnProperty(name = "spring.sleuth.jdbc.enabled", havingValue = "true", matchIfMissing = true)
 @ConditionalOnBean({ DataSource.class, Tracer.class })
-@AutoConfigureAfter(DataSourceAutoConfiguration.class)
+@AutoConfigureAfter({ DataSourceAutoConfiguration.class, BraveAutoConfiguration.class })
 @Import({ P6SpyConfiguration.class, DataSourceProxyConfiguration.class })
 public class TraceJdbcAutoConfiguration {
 
diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TracingJdbcEventListenerTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TracingJdbcEventListenerTests.java
index 776dd5aa1..2cdc6f977 100644
--- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TracingJdbcEventListenerTests.java
+++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TracingJdbcEventListenerTests.java
@@ -21,8 +21,6 @@ import java.sql.PreparedStatement;
 
 import javax.sql.DataSource;
 
-import brave.handler.MutableSpan;
-import brave.test.TestSpanHandler;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -31,6 +29,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cloud.sleuth.autoconfig.instrument.jdbc.TraceJdbcAutoConfiguration;
+import org.springframework.cloud.sleuth.exporter.FinishedSpan;
+import org.springframework.cloud.sleuth.test.TestSpanHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -64,14 +64,14 @@ public abstract class TracingJdbcEventListenerTests extends TracingListenerStrat
 					preparedStatement.executeUpdate();
 					connection.close();
 
-					assertThat(spanReporter.spans()).hasSize(2);
-					MutableSpan connectionSpan = spanReporter.spans().get(1);
-					MutableSpan statementSpan = spanReporter.spans().get(0);
-					assertThat(connectionSpan.name()).isEqualTo("connection");
-					assertThat(statementSpan.name()).isEqualTo("update");
-					assertThat(statementSpan.tags()).containsEntry(SPAN_SQL_QUERY_TAG_NAME,
+					assertThat(spanReporter.reportedSpans()).hasSize(2);
+					FinishedSpan connectionSpan = spanReporter.reportedSpans().get(1);
+					FinishedSpan statementSpan = spanReporter.reportedSpans().get(0);
+					assertThat(connectionSpan.getName()).isEqualTo("connection");
+					assertThat(statementSpan.getName()).isEqualTo("update");
+					assertThat(statementSpan.getTags()).containsEntry(SPAN_SQL_QUERY_TAG_NAME,
 							"UPDATE INFORMATION_SCHEMA.TABLES SET table_Name = ? WHERE 0 = ?");
-					assertThat(statementSpan.tags()).containsEntry(SPAN_ROW_COUNT_TAG_NAME, "0");
+					assertThat(statementSpan.getTags()).containsEntry(SPAN_ROW_COUNT_TAG_NAME, "0");
 				});
 	}