diff --git a/Dockerfile b/Dockerfile
index c31282b..1a61305 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -93,7 +93,10 @@ RUN set -x \
 #	&& gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz \
 	&& tar -xvf tomcat.tar.gz --strip-components=1 \
 	&& rm bin/*.bat \
-	&& rm tomcat.tar.gz*
+	&& rm tomcat.tar.gz* \
+    && mkdir -p conf/Catalina
+    
+ADD files/idp.xml conf/Catalina/idp.xml
 
 
 ENV PATH $CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH
diff --git a/files/idp.xml b/files/idp.xml
new file mode 100644
index 0000000..19c24db
--- /dev/null
+++ b/files/idp.xml
@@ -0,0 +1,4 @@
+<Context docBase="/opt/shibboleth/current/war/idp.war"
+         privileged="true"
+         antiResourceLocking="false"
+         swallowOutput="true" />
\ No newline at end of file
diff --git a/tests/shibboleth-idp.bats b/tests/shibboleth-idp.bats
index cc62ddc..08d72d6 100644
--- a/tests/shibboleth-idp.bats
+++ b/tests/shibboleth-idp.bats
@@ -12,6 +12,11 @@ load ../common
   [ "$result" != '' ]
 }
 
+@test "Tomcat will start Shibboleth IDP when started" {
+  result="$(docker run -i $maintainer/$imagename find conf/Catalina/idp.xml)"
+  [ "$result" != '' ]
+}
+
 @test "Contains java" {
   run docker run -i $maintainer/$imagename which java
   [ "$status" -eq 0 ]