diff --git a/spring-sleuth/pom.xml b/spring-sleuth/pom.xml
index 5fd109e968..a6fba5ea56 100644
--- a/spring-sleuth/pom.xml
+++ b/spring-sleuth/pom.xml
@@ -39,7 +39,7 @@
     </dependencies>
 
     <properties>
-        <spring-cloud-sleuth.version>2.0.2.RELEASE</spring-cloud-sleuth.version>
+        <spring-cloud-sleuth.version>3.1.0</spring-cloud-sleuth.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java
new file mode 100644
index 0000000000..bae1d310a2
--- /dev/null
+++ b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java
@@ -0,0 +1,11 @@
+package com.baeldung.sleuth.traceid;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SleuthCurrentTraceIdApp {
+    public static void main(String[] args) {
+        SpringApplication.run(SleuthCurrentTraceIdApp.class, args);
+    }
+}
diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java
new file mode 100644
index 0000000000..fb4bf2bb1a
--- /dev/null
+++ b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java
@@ -0,0 +1,32 @@
+package com.baeldung.sleuth.traceid;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import brave.Span;
+import brave.Tracer;
+
+@RestController
+public class SleuthTraceIdController {
+
+    private static final Logger logger = LoggerFactory.getLogger(SleuthTraceIdController.class);
+
+    @Autowired
+    private Tracer tracer;
+
+    @GetMapping("/hello")
+    public String hello() {
+        logger.info("Hello with Sleuth");
+        Span span = tracer.currentSpan();
+        if (span != null) {
+            logger.info("Span ID hex {}", span.context().spanIdString());
+            logger.info("Span ID decimal {}", span.context().spanId());
+            logger.info("Trace ID hex {}", span.context().traceIdString());
+            logger.info("Trace ID decimal {}", span.context().traceId());
+        }
+        return "hello";
+    }
+}
diff --git a/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java b/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java
new file mode 100644
index 0000000000..ba181d730b
--- /dev/null
+++ b/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.sleuth.traceid;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SleuthCurrentTraceIdApp.class)
+public class CurrentTraceIdAppSpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java b/spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java
similarity index 83%
rename from spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java
index 8dc2455e63..7ddd194632 100644
--- a/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java
+++ b/spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java
@@ -1,12 +1,10 @@
-package com.baeldung;
+package com.baeldung.spring.session;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.spring.session.SleuthWebApp;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SleuthWebApp.class)
 public class SpringContextTest {