diff --git a/pom.xml b/pom.xml
index 41ece343..2ae01e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,12 +174,13 @@
                   <goal>report</goal>
                 </goals>
                 <configuration>
-                    <excludes>ch/ethz/seb/sebserver/gui/content/**/*
-                        <exclude>ch/ethz/seb/sebserver/gui/content/**/*</exclude>
-                        <exclude>ch/ethz/seb/sebserver/gui/form/**/*</exclude>
-                        <exclude>ch/ethz/seb/sebserver/gui/table/**/*</exclude>
-                        <exclude>ch/ethz/seb/sebserver/gui/widget/**/*</exclude>
-                    </excludes>
+                  <excludes>
+                    ch/ethz/seb/sebserver/gui/content/**/*
+                    <exclude>ch/ethz/seb/sebserver/gui/content/**/*</exclude>
+                    <exclude>ch/ethz/seb/sebserver/gui/form/**/*</exclude>
+                    <exclude>ch/ethz/seb/sebserver/gui/table/**/*</exclude>
+                    <exclude>ch/ethz/seb/sebserver/gui/widget/**/*</exclude>
+                  </excludes>
                 </configuration>
               </execution>
             </executions>
@@ -329,15 +330,21 @@
 
     <!-- Testing -->
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- <dependency> -->
+    <!-- <groupId>org.junit.jupiter</groupId> -->
+    <!-- <artifactId>junit-jupiter-api</artifactId> -->
+    <!-- <scope>test</scope> -->
+    <!-- </dependency> -->
+
+    <!-- <dependency> -->
+    <!-- <groupId>org.junit.vintage</groupId> -->
+    <!-- <artifactId>junit-vintage-engine</artifactId> -->
+    <!-- <scope>test</scope> -->
+    <!-- </dependency> -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
diff --git a/src/test/java/ch/ethz/seb/sebserver/gbl/api/APIMessageTest.java b/src/test/java/ch/ethz/seb/sebserver/gbl/api/APIMessageTest.java
index 7fe6d038..679e78c2 100644
--- a/src/test/java/ch/ethz/seb/sebserver/gbl/api/APIMessageTest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/gbl/api/APIMessageTest.java
@@ -14,7 +14,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
diff --git a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
index 56fa3850..73f3944c 100644
--- a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
@@ -23,9 +23,9 @@ import java.util.stream.Collectors;
 import org.apache.commons.io.IOUtils;
 import org.apache.tomcat.util.buf.StringUtils;
 import org.joda.time.DateTimeZone;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.springframework.core.annotation.Order;
 import org.springframework.test.context.jdbc.Sql;
 
@@ -117,13 +117,13 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.SaveU
 
 public class UseCasesIntegrationTest extends GuiIntegrationTest {
 
-    @BeforeAll
+    @Before
     @Sql(scripts = { "classpath:schema-test.sql", "classpath:data-test.sql" })
     public void init() {
 
     }
 
-    @AfterAll
+    @After
     @Sql(scripts = { "classpath:schema-test.sql", "classpath:data-test.sql" })
     public void cleanup() {
 
diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/edx/OpenEdxCourseRestrictionDataTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/edx/OpenEdxCourseRestrictionDataTest.java
index 84e7bf78..fffbbdab 100644
--- a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/edx/OpenEdxCourseRestrictionDataTest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/edx/OpenEdxCourseRestrictionDataTest.java
@@ -10,7 +10,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.edx;
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
@@ -26,7 +26,7 @@ public class OpenEdxCourseRestrictionDataTest {
         final OpenEdxCourseRestrictionData data = new OpenEdxCourseRestrictionData(null, null, null, null, null, false);
         final String json = mapper.writeValueAsString(data);
         assertEquals(
-                "{\"CONFIG_KEYS\":[],\"BROWSER_KEYS\":[],\"WHITELIST_PATHS\":[],\"BLACKLIST_CHAPTERS\":[],\"PERMISSION_COMPONENTS\":[\"AlwaysAllowStaff\"],\"USER_BANNING_ENABLED\":false}",
+                "{\"CONFIG_KEYS\":[],\"BROWSER_KEYS\":[],\"WHITELIST_PATHS\":[],\"BLACKLIST_CHAPTERS\":[],\"PERMISSION_COMPONENTS\":[],\"USER_BANNING_ENABLED\":false}",
                 json);
     }