diff --git a/Dockerfile b/Dockerfile
index 64efaf0..c31282b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,15 +32,12 @@ RUN yum -y install \
     krb5-workstation \
     mod_ssl \
     openssl-devel \
-    tomcat \
-    tomcat-native.x86_64 \
     wget \
     && yum -y clean all
     
 ENV SHIB_RELDIR=http://shibboleth.net/downloads/identity-provider/$VERSION
 ENV SHIB_PREFIX=shibboleth-identity-provider-$VERSION
 ENV JAVA_HOME /usr/java/latest
-ENV PATH $JAVA_HOME/bin:$PATH
 
 RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \
       wget -q https://shibboleth.net/downloads/PGP_KEYS \
@@ -58,5 +55,47 @@ RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \
            ln -s /opt/shibboleth/$SHIB_PREFIX /opt/shibboleth/current && \
 # Cleanup
            rm -rf /tmp/shibboleth
+           
+ENV CATALINA_HOME /usr/local/tomcat
+ENV PATH $CATALINA_HOME/bin:$PATH
+RUN mkdir -p "$CATALINA_HOME"
+
+# Not having trouble with this locally [JVF]
+# see https://www.apache.org/dist/tomcat/tomcat-8/KEYS
+# RUN set -ex \
+#     && for key in \
+#         05AB33110949707C93A279E3D3EFE6B686867BA6 \
+#         07E48665A34DCAFAE522E5E6266191C37C037D42 \
+#         47309207D818FFD8DCD3F83F1931D684307A10A5 \
+#         541FBE7D8F78B25E055DDEE13C370389288584E7 \
+#         61B832AC2F1C5A90F0F9B00A1C506407564C17A3 \
+#         713DA88BE50911535FE716F5208B0AB1D63011C7 \
+#         79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED \
+#         9BA44C2621385CB966EBA586F72C284D731FABEE \
+#         A27677289986DB50844682F8ACB77FC2E86E29AC \
+#         A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 \
+#         DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 \
+#         F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE \
+#         F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 \
+#     ; do \
+#         gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+#     done
+
+ENV TOMCAT_MAJOR 8
+ENV TOMCAT_VERSION 8.0.36
+ENV TOMCAT_TGZ_URL https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
+
+WORKDIR $CATALINA_HOME
+RUN set -x \
+	\
+	&& wget -q -O tomcat.tar.gz "$TOMCAT_TGZ_URL" \
+	&& wget -q -O tomcat.tar.gz.asc "$TOMCAT_TGZ_URL.asc" \
+#	&& 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*
+
+
+ENV PATH $CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH
 
 ONBUILD COPY ./root/ /opt/shibboleth/$SHIB_PREFIX/
\ No newline at end of file
diff --git a/tests/shibboleth-idp.bats b/tests/shibboleth-idp.bats
index 3528709..cc62ddc 100644
--- a/tests/shibboleth-idp.bats
+++ b/tests/shibboleth-idp.bats
@@ -17,11 +17,21 @@ load ../common
   [ "$status" -eq 0 ]
 }
 
+@test "Contains tomcat" {
+  run docker run -i $maintainer/$imagename which startup.sh
+  [ "$status" -eq 0 ]
+}
+
 @test "exports JAVA_HOME" {
   result="$(docker run -i $maintainer/$imagename env | grep JAVA_HOME)"
   [ "$result" != "" ]
 }
 
+@test "exports CATALINA_HOME" {
+  result="$(docker run -i $maintainer/$imagename env | grep CATALINA_HOME)"
+  [ "$result" != "" ]
+}
+
 @test "Defers configuration via ONBUILD" {
  run grep ONBUILD Dockerfile
  [ "$status" -eq 0 ]