diff --git a/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/swaggerui/disable/config/SwaggerConfig.java b/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/swaggerui/disable/config/SwaggerConfig.java
index 8a9a921036..e3c0237b06 100644
--- a/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/swaggerui/disable/config/SwaggerConfig.java
+++ b/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/swaggerui/disable/config/SwaggerConfig.java
@@ -12,9 +12,9 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@Profile("!prod")
+@Profile("!prod && swagger")
+//@Profile("!prod")
 // @Profile("swagger")
-// @Profile("!prod && swagger")
 // @ConditionalOnExpression(value = "${useSwagger:false}")
 @Configuration
 @EnableSwagger2
diff --git a/spring-web-modules/spring-rest-http-2/src/test/com/baeldung/longpolling/integration/BakeryControllerIntegrationTest.java b/spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/longpolling/BakeryControllerIntegrationTest.java
similarity index 98%
rename from spring-web-modules/spring-rest-http-2/src/test/com/baeldung/longpolling/integration/BakeryControllerIntegrationTest.java
rename to spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/longpolling/BakeryControllerIntegrationTest.java
index abc40d72ca..99a5172c52 100644
--- a/spring-web-modules/spring-rest-http-2/src/test/com/baeldung/longpolling/integration/BakeryControllerIntegrationTest.java
+++ b/spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/longpolling/BakeryControllerIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.longpolling.integration;
+package com.baeldung.longpolling;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-web-modules/spring-rest-http-2/src/test/com/baeldung/requesttimeout/RequestTimeoutUnitTest.java b/spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/requesttimeout/RequestTimeoutIntegrationTest.java
similarity index 97%
rename from spring-web-modules/spring-rest-http-2/src/test/com/baeldung/requesttimeout/RequestTimeoutUnitTest.java
rename to spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/requesttimeout/RequestTimeoutIntegrationTest.java
index da7d40d53c..4775602e8a 100644
--- a/spring-web-modules/spring-rest-http-2/src/test/com/baeldung/requesttimeout/RequestTimeoutUnitTest.java
+++ b/spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/requesttimeout/RequestTimeoutIntegrationTest.java
@@ -9,7 +9,7 @@ import org.springframework.web.reactive.function.client.WebClientRequestExceptio
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
-public class RequestTimeoutTests {
+public class RequestTimeoutIntegrationTest {
 
     private static final WebClient WEB_CLIENT = WebClient.builder().baseUrl("http://localhost:8080").build();