diff --git a/certbot-nginx/tests/boulder-integration.conf.sh b/certbot-nginx/tests/boulder-integration.conf.sh
index 5295e3681..5f077f998 100755
--- a/certbot-nginx/tests/boulder-integration.conf.sh
+++ b/certbot-nginx/tests/boulder-integration.conf.sh
@@ -52,7 +52,7 @@ http {
     listen 8081;
     # IPv6.
     listen [::]:8081 default ipv6only=on;
-    server_name nginx.wtf;
+    server_name nginx.wtf nginx2.wtf;
 
     root $root/webroot;
 
diff --git a/certbot-nginx/tests/boulder-integration.sh b/certbot-nginx/tests/boulder-integration.sh
index b5a698bb3..81b41c71a 100755
--- a/certbot-nginx/tests/boulder-integration.sh
+++ b/certbot-nginx/tests/boulder-integration.sh
@@ -23,18 +23,19 @@ certbot_test_nginx () {
 }
 
 test_deployment_and_rollback() {
+    # Arguments: certname
     echo | openssl s_client -connect localhost:5001 \
         | openssl x509 -out $root/nginx.pem
-    diff -q $root/nginx.pem $root/conf/live/nginx.wtf/cert.pem
+    diff -q $root/nginx.pem "$root/conf/live/$certname/cert.pem"
 
     certbot_test_nginx rollback --checkpoints 9001
     diff -q <(echo "$original") $nginx_conf
 }
 
 certbot_test_nginx --domains nginx.wtf run
-test_deployment_and_rollback
-certbot_test_nginx --domains nginx.wtf --force-renewal --preferred-challenges http
-test_deployment_and_rollback
+test_deployment_and_rollback nginx.wtf
+certbot_test_nginx --domains nginx2.wtf --preferred-challenges http
+test_deployment_and_rollback nginx2.wtf
 
 # note: not reached if anything above fails, hence "killall" at the
 # top