diff --git a/full/Changes b/full/Changes
index c742c97..10684e1 100644
--- a/full/Changes
+++ b/full/Changes
@@ -15,6 +15,8 @@
     - Integrated lite controllers, services and tests in full version (margaretha)
 29/10/2018
     - Moved javax.servlet-api to core (margaretha)
+07/11/2018
+    - OpenJDK8u181-workaround (see Debian Bug report #911925; diewald)
 13/11/2018
     - Added Shutdown handler to Jetty server (margaretha)
     - Fixed storing VC order in NamedVCLoader (margaretha)  
diff --git a/full/pom.xml b/full/pom.xml
index 0f20e87..ba18faf 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -183,8 +183,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.20.1</version>
+				<version>2.22.1</version>
 				<configuration>
+          <useSystemClassLoader>false</useSystemClassLoader>
 					<reuseForks>true</reuseForks>
 					<forkCount>1</forkCount>
 					<threadCount>10</threadCount>
@@ -360,4 +361,4 @@
 			<version>5.62</version>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/lite/Changes b/lite/Changes
index 180dcab..c96f8b4 100644
--- a/lite/Changes
+++ b/lite/Changes
@@ -3,6 +3,8 @@
    - Updated spring and kustvakt-core versions (margaretha)
 29/10/2018
    - Added rewrite handler post construct (margaretha)
+07/11/2018
+    - OpenJDK8u181-workaround (see Debian Bug report #911925; diewald)
 
 version 0.61.0
 30/08/2018
diff --git a/lite/pom.xml b/lite/pom.xml
index 8bf87ce..9394b19 100644
--- a/lite/pom.xml
+++ b/lite/pom.xml
@@ -77,8 +77,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19.1</version>
+				<version>2.22.1</version>
 				<configuration>
+          <useSystemClassLoader>false</useSystemClassLoader>
 					<reuseForks>false</reuseForks>
 					<forkCount>2</forkCount>
 					<threadCount>4</threadCount>