diff --git a/spring-boot-modules/spring-boot-3-2/pom.xml b/spring-boot-modules/spring-boot-3-2/pom.xml
index 9e73d8ea32..276659c609 100644
--- a/spring-boot-modules/spring-boot-3-2/pom.xml
+++ b/spring-boot-modules/spring-boot-3-2/pom.xml
@@ -15,6 +15,14 @@
         <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
+    <repositories>
+        <repository>
+            <id>repository.spring.release</id>
+            <name>Spring GA Repository</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -94,6 +102,17 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>3.2.0-M2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -175,6 +194,18 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>3.2.0-M2</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <profiles>
 
         <profile>
@@ -244,9 +275,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <compilerArgs>--enable-preview</compilerArgs>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/conditionalonthreading/ConditionalOnThreadingUnitTest.java b/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/conditionalonthreading/ConditionalOnThreadingUnitTest.java
new file mode 100644
index 0000000000..ed65769954
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/conditionalonthreading/ConditionalOnThreadingUnitTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.conditionalonthreading;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
+import org.springframework.boot.autoconfigure.thread.Threading;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+public class ConditionalOnThreadingUnitTest {
+
+    ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
+      .withUserConfiguration(CurrentConfig.class);
+
+    @Configuration
+    static class CurrentConfig {
+
+        @Bean
+        @ConditionalOnThreading(Threading.PLATFORM)
+        ThreadingType platformBean() {
+            return ThreadingType.PLATFORM;
+        }
+
+        @Bean
+        @ConditionalOnThreading(Threading.VIRTUAL)
+        ThreadingType virtualBean() {
+            return ThreadingType.VIRTUAL;
+        }
+    }
+
+    enum ThreadingType {
+        PLATFORM, VIRTUAL
+    }
+
+    @Test
+    @EnabledForJreRange(max = JRE.JAVA_20)
+    public void whenJava20AndVirtualThreadsEnabled_thenThreadingIsPlatform() {
+        applicationContextRunner.withPropertyValues("spring.threads.virtual.enabled=true").run(context -> {
+            Assertions.assertThat(context.getBean(ThreadingType.class)).isEqualTo(ThreadingType.PLATFORM);
+        });
+    }
+
+    @Test
+    @EnabledForJreRange(max = JRE.JAVA_20)
+    public void whenJava20AndVirtualThreadsDisabled_thenThreadingIsPlatform() {
+        applicationContextRunner.withPropertyValues("spring.threads.virtual.enabled=false").run(context -> {
+            Assertions.assertThat(context.getBean(ThreadingType.class)).isEqualTo(ThreadingType.PLATFORM);
+        });
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_21)
+    public void whenJava21AndVirtualThreadsEnabled_thenThreadingIsVirtual() {
+        applicationContextRunner.withPropertyValues("spring.threads.virtual.enabled=true").run(context -> {
+            Assertions.assertThat(context.getBean(ThreadingType.class)).isEqualTo(ThreadingType.VIRTUAL);
+        });
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_21)
+    public void whenJava21AndVirtualThreadsDisabled_thenThreadingIsPlatform() {
+        applicationContextRunner.withPropertyValues("spring.threads.virtual.enabled=false").run(context -> {
+            Assertions.assertThat(context.getBean(ThreadingType.class)).isEqualTo(ThreadingType.PLATFORM);
+        });
+    }
+
+}
\ No newline at end of file