diff --git a/pom.xml b/pom.xml
index 831116e..8c561e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-spring-boot-test-api</artifactId>
+    <artifactId>quarkus-spring-test-api</artifactId>
     <version>3.5.Alpha1-SNAPSHOT</version>
 
-    <name>Spring Boot dependencies for Quarkus</name>
+    <name>Spring Test dependencies for Quarkus</name>
     <description>The minimum dependencies to reduce the footprint of Quarkus applications using the Spring Boot features</description>
     <url>https://quarkus.io/</url>
     <developers>
@@ -43,12 +43,14 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <spring-boot-test.version>3.5.7</spring-boot-test.version>
+        <spring-test.version>6.2.12</spring-test.version>
+        <quarkus-junit.version>3.32.3</quarkus-junit.version>
     </properties>
 
     <packaging>pom</packaging>
     <modules>
-        <module>quarkus-spring-boot-test-core-api</module>
-<!--        <module>quarkus-spring-boot-properties-api</module>-->
+        <module>quarkus-spring-boot-test-api</module>
+        <module>quarkus-spring-test-core-api</module>
     </modules>
 
 
@@ -59,6 +61,16 @@
                 <artifactId>spring-boot-test</artifactId>
                 <version>${spring-boot-test.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring-test.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-junit</artifactId>
+                <version>${quarkus-junit.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/quarkus-spring-boot-test-api/pom.xml b/quarkus-spring-boot-test-api/pom.xml
new file mode 100644
index 0000000..32045a1
--- /dev/null
+++ b/quarkus-spring-boot-test-api/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-spring-test-api</artifactId>
+        <version>3.5.Alpha1-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-spring-boot-test-api</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/quarkus-spring-boot-test-core-api/src/main/java/Dummy.java b/quarkus-spring-boot-test-api/src/main/java/Dummy.java
similarity index 100%
rename from quarkus-spring-boot-test-core-api/src/main/java/Dummy.java
rename to quarkus-spring-boot-test-api/src/main/java/Dummy.java
diff --git a/quarkus-spring-boot-test-api/src/main/java/org/springframework/boot/test/context/SpringBootTest.java b/quarkus-spring-boot-test-api/src/main/java/org/springframework/boot/test/context/SpringBootTest.java
new file mode 100644
index 0000000..08087c4
--- /dev/null
+++ b/quarkus-spring-boot-test-api/src/main/java/org/springframework/boot/test/context/SpringBootTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * 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.
+ */
+
+package org.springframework.boot.test.context;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.quarkus.test.junit.QuarkusTestExtension;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@ExtendWith(QuarkusTestExtension.class)
+public @interface SpringBootTest {
+
+}
\ No newline at end of file
diff --git a/quarkus-spring-boot-test-core-api/pom.xml b/quarkus-spring-test-core-api/pom.xml
similarity index 80%
rename from quarkus-spring-boot-test-core-api/pom.xml
rename to quarkus-spring-test-core-api/pom.xml
index 65b4c84..fe93136 100644
--- a/quarkus-spring-boot-test-core-api/pom.xml
+++ b/quarkus-spring-test-core-api/pom.xml
@@ -4,18 +4,18 @@
 
     <parent>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-spring-boot-test-api</artifactId>
+        <artifactId>quarkus-spring-test-api</artifactId>
         <version>3.5.Alpha1-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-spring-boot-test-core-api</artifactId>
-    <version>3.5.Alpha1-SNAPSHOT</version>
+    <artifactId>quarkus-spring-test-core-api</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
         </dependency>
     </dependencies>
 
@@ -35,15 +35,14 @@
                             <createSourcesJar>true</createSourcesJar>
                             <artifactSet>
                                 <includes>
-                                    <include>org.springframework.boot:spring-boot-test</include>
+                                    <include>org.springframework:spring-test</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>org.springframework.boot:spring-boot-test</artifact>
+                                    <artifact>org.springframework:spring-test</artifact>
                                     <includes>
-                                        <!-- Used in Quarkus -->
-                                        <include>org/springframework/boot/test/context/SpringBootTest**</include>
+                                        <include>org/springframework/test/context/junit/jupiter/SpringExtension**</include>
                                     </includes>
                                 </filter>
                             </filters>
diff --git a/quarkus-spring-test-core-api/src/main/java/Dummy.java b/quarkus-spring-test-core-api/src/main/java/Dummy.java
new file mode 100644
index 0000000..3666fb8
--- /dev/null
+++ b/quarkus-spring-test-core-api/src/main/java/Dummy.java
@@ -0,0 +1,7 @@
+/***
+ * Dummy class for javadoc
+ *
+ */
+
+public class Dummy {
+}