diff --git a/client/src/main/java/nl/altindag/client/stepdefs/BaseStepDefs.java b/client/src/main/java/nl/altindag/client/stepdefs/BaseStepDefs.java
index f00daef..2eb9590 100644
--- a/client/src/main/java/nl/altindag/client/stepdefs/BaseStepDefs.java
+++ b/client/src/main/java/nl/altindag/client/stepdefs/BaseStepDefs.java
@@ -23,11 +23,10 @@
 import java.util.function.Function;
 
 import nl.altindag.client.ClientType;
-import nl.altindag.client.SpringBootHelper;
 import nl.altindag.client.TestScenario;
 import nl.altindag.client.service.RequestService;
 
-public class BaseStepDefs extends SpringBootHelper {
+public class BaseStepDefs {
 
     protected TestScenario testScenario;
     private final Map<ClientType, RequestService> requestServices;
diff --git a/client/src/main/java/nl/altindag/client/stepdefs/HelloStepDefs.java b/client/src/main/java/nl/altindag/client/stepdefs/HelloStepDefs.java
index 184a06b..4591b71 100644
--- a/client/src/main/java/nl/altindag/client/stepdefs/HelloStepDefs.java
+++ b/client/src/main/java/nl/altindag/client/stepdefs/HelloStepDefs.java
@@ -19,7 +19,6 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import io.cucumber.spring.CucumberContextConfiguration;
 import nl.altindag.client.ClientException;
 import nl.altindag.client.ClientType;
 import nl.altindag.client.Constants;
@@ -35,13 +34,12 @@
 import static nl.altindag.client.Constants.HELLO_ENDPOINT;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@CucumberContextConfiguration
 public class HelloStepDefs extends BaseStepDefs {
 
     private static final Logger LOGGER = LogManager.getLogger(HelloStepDefs.class);
 
     @Autowired
-    @SuppressWarnings("SpringJavaAutowiredMembersInspection")
+    @SuppressWarnings({"SpringJavaAutowiredMembersInspection", "SpringJavaInjectionPointsAutowiringInspection"})
     public HelloStepDefs(TestScenario testScenario, List<RequestService> requestServices) {
         super(testScenario, requestServices);
     }
diff --git a/client/src/main/java/nl/altindag/client/SpringBootHelper.java b/client/src/main/java/nl/altindag/client/stepdefs/SpringBootHelper.java
similarity index 85%
rename from client/src/main/java/nl/altindag/client/SpringBootHelper.java
rename to client/src/main/java/nl/altindag/client/stepdefs/SpringBootHelper.java
index f9bd444..eba08de 100644
--- a/client/src/main/java/nl/altindag/client/SpringBootHelper.java
+++ b/client/src/main/java/nl/altindag/client/stepdefs/SpringBootHelper.java
@@ -13,14 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.altindag.client;
+package nl.altindag.client.stepdefs;
 
+import io.cucumber.spring.CucumberContextConfiguration;
+import nl.altindag.client.CucumberConfig;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootContextLoader;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
+@CucumberContextConfiguration
 @ContextConfiguration(classes = CucumberConfig.class, loader = SpringBootContextLoader.class)
 public class SpringBootHelper {
 
diff --git a/pom.xml b/pom.xml
index f488fa3..f200545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <version.spring>2.7.18</version.spring> <!--TODO Bump me-->
         <version.slf4j>1.7.33</version.slf4j>
         <version.apache.httpclient>4.5.13</version.apache.httpclient>
-        <version.cucumber>7.9.0</version.cucumber> <!--TODO Bump me-->
+        <version.cucumber>7.18.0</version.cucumber>
         <version.maven-fail-safe>3.2.5</version.maven-fail-safe>
         <version.maven-surefire-plugin>3.2.5</version.maven-surefire-plugin>
         <version.aspectjweaver>1.9.22.1</version.aspectjweaver>