diff --git a/.travis.yml b/.travis.yml
index b93dc168..0f03c4a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,11 @@ language: go
 go:
     - "1.14.x"
 
+before_install:
+  # https://github.com/travis-ci/travis-ci/issues/8361
+  - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+
 script:
 - make
 - make test
+- make smoke
diff --git a/Makefile b/Makefile
index 6888b05c..eb2500d4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all install build release capdefs test
+.PHONY: all install build release capdefs test smoke
 
 capdef_file = ./irc/caps/defs.go
 
@@ -29,3 +29,7 @@ test:
 	cd irc/passwd && go test . && go vet .
 	cd irc/utils && go test . && go vet .
 	./.check-gofmt.sh
+
+smoke:
+	oragono mkcerts --conf ./oragono.yaml || true
+	oragono run --conf ./oragono.yaml --smoke
diff --git a/oragono.go b/oragono.go
index dcf0f43e..6b2ee832 100644
--- a/oragono.go
+++ b/oragono.go
@@ -98,7 +98,7 @@ Usage:
 	oragono genpasswd [--conf <filename>] [--quiet]
 	oragono mkcerts [--conf <filename>] [--quiet]
 	oragono mksecret [--conf <filename>] [--quiet]
-	oragono run [--conf <filename>] [--quiet]
+	oragono run [--conf <filename>] [--quiet] [--smoke]
 	oragono -h | --help
 	oragono --version
 Options:
@@ -197,6 +197,8 @@ Options:
 			logman.Info("server", "Server running")
 			defer logman.Info("server", fmt.Sprintf("Oragono v%s exiting", irc.SemVer))
 		}
-		server.Run()
+		if !arguments["--smoke"].(bool) {
+			server.Run()
+		}
 	}
 }