diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
index 419ac22fdf..ed2e998a00 100644
--- a/eclipse/spring-boot-project.setup
+++ b/eclipse/spring-boot-project.setup
@@ -139,8 +139,14 @@
     <workingSet
         name="spring-boot-tests">
       <predicate
-          xsi:type="predicates:NamePredicate"
-          pattern="spring-boot-.*-test.*"/>
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:NamePredicate"
+            pattern="spring-boot-(.*-test|tests).*"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.7/@workingSets.3"/>
+      </predicate>
     </workingSet>
   </setupTask>
   <setupTask
diff --git a/spring-boot-tests/pom.xml b/spring-boot-tests/pom.xml
index 9cf0415d18..fc79c4ae82 100644
--- a/spring-boot-tests/pom.xml
+++ b/spring-boot-tests/pom.xml
@@ -30,6 +30,7 @@
 				</property>
 			</activation>
 			<modules>
+				<module>spring-boot-smoke-tests</module>
 				<module>spring-boot-smoke-tests-invoker</module>
 				<module>spring-boot-integration-tests</module>
 				<module>spring-boot-deployment-tests</module>