diff --git a/pom.xml b/pom.xml
index dbc4735..2614ded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -927,7 +927,7 @@
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <excludeTransitive>true</excludeTransitive>
-              <includeArtifactIds>hawtbuf,tomcat-websocket,tomcat-util,tomcat-util-scan,tomcat-juli,tomcat-api,openejb-lite,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
+              <includeArtifactIds>hawtbuf,tomcat-websocket,tomcat-util,tomcat-util-scan,tomcat-juli,tomcat-catalina,tomee-security,tomcat-api,openejb-lite,activemq-client,tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
             </configuration>
           </execution>
           <execution>
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index d9ab4b4..78e3d9e 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -235,4 +235,5 @@
 provider.configuration.file=%basedir%/%openejb.home%/conf/ProviderConfiguration.xml
 j2eelogin.name=j2ee
 j2eelogin.password=j2ee
-servlet.is.jsr115.compatible=false
\ No newline at end of file
+servlet.is.jsr115.compatible=false
+logical.hostname.servlet=Catalina/localhost
\ No newline at end of file
diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plume/conf/context.xml
index 023c798..9736302 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomee-plume/conf/context.xml
@@ -28,4 +28,8 @@
     <!--
     <Manager pathname="" />
     -->
+
+    <!-- this is for Jaspic so we can override the default CallbackHandler until we discuss on Tomcat Mailing list -->
+    <Valve className="org.apache.catalina.authenticator.BasicAuthenticator"
+           jaspicCallbackHandlerClass="org.apache.tomee.security.provider.CallbackHandlerImpl"/>
 </Context>