diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 866f642ec4..28dc449c7b 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -137,6 +137,7 @@ import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.postgresql.util.PSQLException;
 
@@ -759,12 +760,16 @@ public abstract class jOOQAbstractTest<
         return "";
     }
 
-    @Test
-    public void testStart() {
-        // An initial test case to clean up the test database
+    @BeforeClass
+    public static void testStart() {
         log.info("STARTING");
     }
 
+    @AfterClass
+    public static void testFinish() {
+        log.info("FINISHING");
+    }
+
     // IMPORTANT! Make this the first test, to prevent side-effects
     @Test
     public void testInsertIdentity() throws Exception {
@@ -1847,10 +1852,4 @@ public abstract class jOOQAbstractTest<
     public void testCancelStatement() throws Exception {
         new StatementTests(this).testCancelStatement();
     }
-
-    @Test
-    public void testFinish() {
-        // A final test case to clean up the test database
-        log.info("FINISHING");
-    }
 }