diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml
index e6d80ed..1ff795d 100644
--- a/.github/workflows/run-all-tests.yml
+++ b/.github/workflows/run-all-tests.yml
@@ -21,8 +21,16 @@ jobs:
       - uses: actions/checkout@v1
       - name: Build the docker-compose stack
         run: docker-compose up -d --build
-      - name: Run test suite on centos6
+      - name: Run test suite on CentOS6
         run: test/run-test.sh centos6
+  test-centos7:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v1
+        - name: Build the docker-compose stack
+          run: docker-compose up -d --build
+        - name: Run test suite on CentOS7
+          run: test/run-test.sh centos7
   test-centos7-duckdns:
     runs-on: ubuntu-latest
     steps:
diff --git a/test/2-simple-dns01-nslookup.bats b/test/2-simple-dns01-nslookup.bats
index f92d817..c8d5cc6 100644
--- a/test/2-simple-dns01-nslookup.bats
+++ b/test/2-simple-dns01-nslookup.bats
@@ -8,12 +8,16 @@ load '/getssl/test/test_helper.bash'
 # This is run for every test
 setup() {
     export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
-    mv /usr/bin/dig /usr/bin/dig.getssl.bak
+    if [ -f /usr/bin/dig ]; then
+        mv /usr/bin/dig /usr/bin/dig.getssl.bak
+    fi
 }
 
 
 teardown() {
-    mv /usr/bin/dig.getssl.bak /usr/bin/dig
+    if [ -f /usr/bin/dig.getssl.bak ]; then
+        mv /usr/bin/dig.getssl.bak /usr/bin/dig
+    fi
 }
 
 
diff --git a/test/Dockerfile-centos7 b/test/Dockerfile-centos7
new file mode 100644
index 0000000..8a34bc5
--- /dev/null
+++ b/test/Dockerfile-centos7
@@ -0,0 +1,20 @@
+FROM centos:centos7
+
+# Note this image uses drill, does not have dig or nslookup installed
+
+# Update and install required software
+RUN yum -y update
+RUN yum -y install epel-release
+RUN yum -y install git curl ldns wget which nginx
+
+WORKDIR /root
+RUN mkdir /etc/nginx/pki
+RUN mkdir /etc/nginx/pki/private
+COPY ./test/test-config/nginx-ubuntu-no-ssl /etc/nginx/conf.d/default.conf
+COPY ./test/test-config/nginx-centos7.conf /etc/nginx/nginx.conf
+
+# BATS (Bash Automated Testings)
+RUN git clone https://github.com/bats-core/bats-core.git /bats-core
+RUN git clone https://github.com/jasonkarns/bats-support /bats-support
+RUN git clone https://github.com/jasonkarns/bats-assert-1 /bats-assert
+RUN /bats-core/install.sh /usr/local
diff --git a/test/debug-test.sh b/test/debug-test.sh
index 890366b..ac94b53 100755
--- a/test/debug-test.sh
+++ b/test/debug-test.sh
@@ -10,7 +10,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #shellcheck disable=SC1091
-source /getssl/test/test_helper.bash
+source /getssl/test/test_helper.bash 3>&1
 
 CONFIG_FILE=$1
 if [ ! -e "$CONFIG_FILE" ]; then
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 3ffcf51..f311b18 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -58,15 +58,14 @@ fi
 
 # Find IP address
 if [[ -n "$(command -v ip)" ]]; then
-    IP=$(ip address)
+    GETSSL_IP=$(ip address | awk '/10.30.50/ { print $2 }' | awk -F/ '{ print $1 }')
 elif [[ -n "$(command -v hostname)" ]]; then
-    IP=$(hostname -I)
+    GETSSL_IP=$(hostname -I | sed -e 's/[[:space:]]*$//')
 else
     echo "Cannot find IP address"
     exit 1
 fi
 
-GETSSL_IP=$(echo "$IP" | awk '/10.30.50/ { print $2 }' | awk -F/ '{ print $1 }')
 export GETSSL_IP
 
 if [ ! -f ${INSTALL_DIR}/pebble.minica.pem ]; then