diff --git a/testing-modules/testing-libraries/src/test/java/com/baeldung/cucumberhooks/books/BookStoreWithHooksIntegrationHooks.java b/testing-modules/testing-libraries/src/test/java/com/baeldung/cucumberhooks/books/BookStoreWithHooksIntegrationHooks.java
new file mode 100644
index 0000000000..8de55e4611
--- /dev/null
+++ b/testing-modules/testing-libraries/src/test/java/com/baeldung/cucumberhooks/books/BookStoreWithHooksIntegrationHooks.java
@@ -0,0 +1,48 @@
+package com.baeldung.cucumberhooks.books;
+
+import io.cucumber.core.api.Scenario;
+import io.cucumber.java.After;
+import io.cucumber.java.AfterStep;
+import io.cucumber.java.Before;
+import io.cucumber.java.BeforeStep;
+import io.cucumber.java8.En;
+
+public class BookStoreWithHooksIntegrationHooks implements En {
+
+    public BookStoreWithHooksIntegrationHooks() {
+        Before(1, () -> startBrowser());
+    }
+
+    @Before(order=2, value="@Screenshots")
+    public void beforeScenario(Scenario scenario) {
+        takeScreenshot();
+    }
+
+    @After
+    public void afterScenario(Scenario scenario) {
+        takeScreenshot();
+    }
+
+    @BeforeStep
+    public void beforeStep(Scenario scenario) {
+        takeScreenshot();
+    }
+
+    @AfterStep
+    public void afterStep(Scenario scenario) {
+        takeScreenshot();
+        closeBrowser();
+    }
+
+    public void takeScreenshot() {
+        //code to take and save screenshot
+    }
+
+    public void startBrowser() {
+        //code to open browser
+    }
+
+    public void closeBrowser() {
+        //code to close browser
+    }
+}
diff --git a/testing-modules/testing-libraries/src/test/java/com/baeldung/cucumberhooks/books/BookStoreWithHooksIntegrationTest.java b/testing-modules/testing-libraries/src/test/java/com/baeldung/cucumberhooks/books/BookStoreWithHooksIntegrationTest.java
index 4db8157c21..79e43bad27 100644
--- a/testing-modules/testing-libraries/src/test/java/com/baeldung/cucumberhooks/books/BookStoreWithHooksIntegrationTest.java
+++ b/testing-modules/testing-libraries/src/test/java/com/baeldung/cucumberhooks/books/BookStoreWithHooksIntegrationTest.java
@@ -1,11 +1,5 @@
 package com.baeldung.cucumberhooks.books;
 
-import io.cucumber.core.api.Scenario;
-import io.cucumber.java.After;
-import io.cucumber.java.AfterStep;
-import io.cucumber.java.Before;
-import io.cucumber.java.BeforeStep;
-import io.cucumber.java8.En;
 import io.cucumber.junit.Cucumber;
 import io.cucumber.junit.CucumberOptions;
 import org.junit.runner.RunWith;
@@ -14,42 +8,6 @@ import org.junit.runner.RunWith;
 @CucumberOptions(features = "classpath:features/book-store-with-hooks.feature",
   glue = "com.baeldung.cucumberhooks.books"
 )
-public class BookStoreWithHooksIntegrationTest implements En {
+public class BookStoreWithHooksIntegrationTest {
 
-    public BookStoreWithHooksIntegrationTest() {
-        Before(1, () -> startBrowser());
-    }
-
-    @Before(order=2, value="@Screenshots")
-    public void beforeScenario(Scenario scenario) {
-        takeScreenshot();
-    }
-
-    @After
-    public void afterScenario(Scenario scenario) {
-        takeScreenshot();
-    }
-
-    @BeforeStep
-    public void beforeStep(Scenario scenario) {
-        takeScreenshot();
-    }
-
-    @AfterStep
-    public void afterStep(Scenario scenario) {
-        takeScreenshot();
-        closeBrowser();
-    }
-
-    public void takeScreenshot() {
-        //code to take and save screenshot
-    }
-
-    public void startBrowser() {
-        //code to open browser
-    }
-
-    public void closeBrowser() {
-        //code to close browser
-    }
 }