diff --git a/samples/cas/cas.gradle b/samples/cas/cas.gradle
index 396b0f0182..de59e0d0d8 100644
--- a/samples/cas/cas.gradle
+++ b/samples/cas/cas.gradle
@@ -69,8 +69,28 @@ dependencies {
         System.setProperty('cas.service.host', jettyRunWar.httpsHost)
     }
 }
-
-task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
+task casServerOverlay(type: Sync) {
+    war = configurations.casServer.resolve().toArray()[0]
+    warName = war.name.replace('.war','-custom')
+    overlayDir = file('src/cas-server-overlay/webapp')
+    explodedWar = file("$buildDir/tmp/${warName}")
+    customWar = file("$buildDir/tmp/${warName}.war")
+
+    inputs.files(war, overlayDir)
+    outputs.files(customWar, explodedWar, file("$buildDir/tmp/expandedArchives"))
+
+    from zipTree(war)
+    from overlayDir
+    into explodedWar
+
+    doLast {
+        if(customWar.exists()) {
+            customWar.delete()
+        }
+        ant.zip(destfile: customWar, baseDir: explodedWar)
+    }
+}
+task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar, dependsOn: 'casServerOverlay') {
     contextPath = "/cas"
     connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
     connectors[0].port = 9443
@@ -78,7 +98,10 @@ task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
     connectors[0].keyPassword = connectors[0].trustPassword = password
     connectors[0].wantClientAuth = true
     connectors[0].needClientAuth = false
-    webApp = configurations.casServer.resolve().toArray()[0]
+    webApp = casServerOverlay.customWar
+
+    inputs.file casServerOverlay.customWar
+
     doFirst() {
         System.setProperty('javax.net.ssl.trustStore', keystore)
         System.setProperty('javax.net.ssl.trustStorePassword', password)
@@ -87,7 +110,7 @@ task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
 
 task cas (dependsOn: [jettyRunWar, casServer]) {
 }
-/*
+
 integrationTest.dependsOn cas
 integrationTest.doFirst {
     systemProperties['cas.server.host'] = casServer.httpsHost
@@ -96,8 +119,6 @@ integrationTest.doFirst {
     systemProperties['javax.net.ssl.trustStore'] = keystore
     systemProperties['javax.net.ssl.trustStorePassword'] = password
 }
-*/
-integrationTest.enabled = false
 
 gradle.taskGraph.whenReady {graph ->
     if (graph.hasTask(cas)) {
diff --git a/samples/cas/src/cas-server-overlay/webapp/WEB-INF/spring-configuration/zzzhttpClientCustomization.xml b/samples/cas/src/cas-server-overlay/webapp/WEB-INF/spring-configuration/zzzhttpClientCustomization.xml
new file mode 100644
index 0000000000..5ba031b6e4
--- /dev/null
+++ b/samples/cas/src/cas-server-overlay/webapp/WEB-INF/spring-configuration/zzzhttpClientCustomization.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+    <description>
+        Customizations to the CAS Server. The name starts with zzz to ensure it is the last file loaded to override other bean definitions.
+    </description>
+
+    <!-- Make requests synchronous. This ensures that Single Logout has completed before the Logout page renders. -->
+    <bean id="httpClient" class="org.jasig.cas.util.HttpClient"
+      p:readTimeout="5000"
+      p:connectionTimeout="5000">
+      <property name="executorService">
+        <bean class="org.springframework.core.task.support.ExecutorServiceAdapter">
+            <constructor-arg>
+                <bean class="org.springframework.core.task.SyncTaskExecutor"/>
+            </constructor-arg>
+        </bean>
+      </property>
+    </bean>
+</beans>
\ No newline at end of file