diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index 395fdee221..b835bb71ed 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -46,10 +46,8 @@ sourceSets.main.compileClasspath += configurations.provided
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
-System.setProperty('apacheDSWorkDir', "${buildDir}/apacheDSWork")
-
 test {
-    jvmArgs = ['-ea', '-Xmx500m']
+    jvmArgs = ['-ea', '-Xmx500m', "-DapacheDSWorkDir=${buildDir}/apacheDSWork"]
     maxParallelForks = guessMaxForks()
     testReport = false
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java
new file mode 100644
index 0000000000..20c98a974f
--- /dev/null
+++ b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java
@@ -0,0 +1,7 @@
+package org.springframework.security.web.authentication.logout;
+
+/**
+ * @author Luke Taylor
+ */
+public class CookieClearingLogoutHandler {
+}
diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java
new file mode 100644
index 0000000000..c7b04f7e5c
--- /dev/null
+++ b/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java
@@ -0,0 +1,7 @@
+package org.springframework.security.web.authentication.logout;
+
+/**
+ * @author Luke Taylor
+ */
+public class CookieClearingLogoutHandlerTests {
+}