diff --git a/test/MODCLUSTER-755/files/server.xml b/test/MODCLUSTER-755/files/server.xml
index 26d80bd65..5b23418f6 100644
--- a/test/MODCLUSTER-755/files/server.xml
+++ b/test/MODCLUSTER-755/files/server.xml
@@ -20,7 +20,6 @@
      Documentation at /docs/config/server.html
  -->
 <Server port="8005" shutdown="SHUTDOWN" address="127.0.0.1">
-  <!-- <Listener className="org.jboss.modcluster.container.tomcat.ModClusterListener" advertise="true" stickySession="true" stickySessionForce="false" stickySessionRemove="true" /> -->
   <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />
diff --git a/test/tomcat/server.xml b/test/tomcat/server.xml
index 205a2d8fe..0ea050ab0 100644
--- a/test/tomcat/server.xml
+++ b/test/tomcat/server.xml
@@ -20,9 +20,7 @@
      Documentation at /docs/config/server.html
  -->
 <Server port="8005" shutdown="SHUTDOWN" address="tomcat_address" portOffset="port_offset">
-  <!-- <Listener className="org.jboss.modcluster.container.tomcat.ModClusterListener"
-            advertise="true" stickySession="true" stickySessionForce="false" stickySessionRemove="true" /> -->
-  <Listener className="org.jboss.modcluster.container.catalina.standalone.ModClusterListener"
+  <Listener className="org.jboss.modcluster.container.tomcat.ModClusterListener"
             connectorPort="8080"
             proxyList="proxy_address:proxy_port" />
   <Listener className="org.apache.catalina.startup.VersionLoggerListener" />