diff --git a/Vagrantfile b/Vagrantfile
index e485988f1..b990d1311 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,18 +5,15 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "hashicorp/precise32"
 
   config.vm.define "sender" do |sender|
     sender.vm.network "private_network", ip: "192.168.33.5"
+    sender.vm.hostname = "sender.example.com"
   end
   config.vm.define "valid" do |valid|
     valid.vm.network "private_network", ip: "192.168.33.7"
+    valid.vm.hostname = "valid-example-recipient.com"
   end
   config.vm.provision :shell, path: "vagrant-bootstrap.sh"
 
diff --git a/check-starttls.py b/check-starttls.py
index 15bc7ce64..72f0d3430 100755
--- a/check-starttls.py
+++ b/check-starttls.py
@@ -35,7 +35,7 @@ def extract_names(pem):
         # >>> twitter_cert.get_ext('subjectAltName').get_value()
         # 'DNS:www.twitter.com, DNS:twitter.com'
         alt_names = leaf.get_ext('subjectAltName').get_value()
-        alt_names = alt_names.split(',')
+        alt_names = alt_names.split(', ')
         alt_names = [name.partition(':') for name in alt_names]
         alt_names = [name for prot, _, name in alt_names if prot == 'DNS']
     except:
@@ -43,48 +43,52 @@ def extract_names(pem):
     return set(common_names + alt_names)
 
 def tls_connect(mx_host, mail_domain):
-  # smtplib doesn't let us access certificate information,
-  # so shell out to openssl.
-  output = subprocess.check_output(
-      """openssl s_client \
-         -CApath /usr/share/ca-certificates/mozilla/ \
-         -starttls smtp -connect %s:25 -showcerts </dev/null
-         """ % mx_host, shell=True)
+  if supports_starttls(mx_host):
+    # smtplib doesn't let us access certificate information,
+    # so shell out to openssl.
+    try:
+      output = subprocess.check_output(
+          """openssl s_client \
+             -CApath /usr/share/ca-certificates/mozilla/ \
+             -starttls smtp -connect %s:25 -showcerts </dev/null \
+             2>/dev/null
+             """ % mx_host, shell=True)
+    except subprocess.CalledProcessError:
+      print "Failed s_client"
+      return
 
-  # Save a copy of the certificate for later analysis
-  with open(os.path.join(mail_domain, mx_host), "w") as f:
-    f.write(output)
+    # Save a copy of the certificate for later analysis
+    with open(os.path.join(mail_domain, mx_host), "w") as f:
+      f.write(output)
 
-  cert = re.findall("-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----", output, flags = re.DOTALL)
-  if len(cert) > 0:
-    print "iiii ", len(cert)
-    print extract_names(cert[0])
-  #lines = output.split("\n")
-  #for i in range(0, len(lines)):
-    #line = lines[i]
-    #if re.search("Subject:.* CN=(.*)", line):
-      #m = re.search("Subject:.* CN=(.*)", line)
-      #print "CN=", m.group(1)
-    #elif re.search("Subject Alternative Name:", line):
-      #dns = re.findall("DNS:([^,]*),", lines[i+1])
-      #for d in dns:
-        #print d
+    cert = re.findall("-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----", output, flags = re.DOTALL)
+    if len(cert) > 0:
+      names = extract_names(cert[0])
+      print "%s certificate -> %s" % (mx_host, ", ".join(names))
+      if mx_host in names:
+        print "  MATCH"
+      else:
+        print "  NOMATCH"
 
-#  try:
-#    smtpserver = smtplib.SMTP(mx_host, 25, timeout = 2)
-#    smtpserver.ehlo()
-#    smtpserver.starttls()
-#    print "Success: %s" % mx_host
-#  except socket.error as e:
-#    print "Connection to %s failed: %s" % (mx_host, e.strerror)
-#    pass
+def supports_starttls(mx_host):
+  try:
+    smtpserver = smtplib.SMTP(mx_host, 25, timeout = 2)
+    smtpserver.ehlo()
+    smtpserver.starttls()
+    return True
+    print "Success: %s" % mx_host
+  except socket.error as e:
+    print "Connection to %s failed: %s" % (mx_host, e.strerror)
+    return False
+  except smtplib.SMTPException:
+    print "No STARTTLS support on %s" % mx_host
+    return False
 
 def check(mail_domain):
   mkdirp(mail_domain)
   answers = dns.resolver.query(mail_domain, 'MX')
   for rdata in answers:
-      mx_host = str(rdata.exchange)
-      print 'Host', rdata.exchange, 'has preference', rdata.preference
+      mx_host = str(rdata.exchange).rstrip(".")
       tls_connect(mx_host, mail_domain)
 
 if len(sys.argv) == 1:
diff --git a/vagrant-bootstrap.sh b/vagrant-bootstrap.sh
index ac9837198..215abacfd 100755
--- a/vagrant-bootstrap.sh
+++ b/vagrant-bootstrap.sh
@@ -3,8 +3,25 @@
 export DEBIAN_FRONTEND=noninteractive
 
 apt-get update -q
-apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" postfix
-cat > /etc/hosts <<<EOF
+apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
+  postfix dnsmasq mutt
+
+# Provide hostnames so the boxes can talk to each other. DNSMasq will also serve
+# results to each box based on these contents.
+cat >> /etc/hosts <<EOF
 192.168.33.5 sender sender.example.com
 192.168.33.7 valid valid-example-recipient.com
 EOF
+
+# All local domains get an MX record pointing at themselves
+echo selfmx > /etc/dnsmasq.conf
+# Not sure why restart is necessary, but otherwise dnsmasq doesn't use
+# /etc/hosts to answer queries.
+/etc/init.d/dnsmasq restart
+
+if [ "`hostname`" = "sender" ]; then
+  crontab <<EOF
+    MAILTO=vagrant@valid-example-recipient.com
+    * * * * * echo "hi"
+EOF
+fi