diff --git a/.gitignore b/.gitignore
index dc0ffec091ea2ce83f42bda4b400dec66c4f443c..a7e130a3450fda918e0ba8fc05caaf3cd2745eb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ openssl.cnf
 CA.key
 CA.crt
 CA.p12
-server.pid
+.server.pid
diff --git a/Makefile b/Makefile
index cc14422411a7f1840bf4f4463d629e9b19a14c88..2acc31b36c5ef69c7b487e9ed160198c256de55f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ install:
 	chmod 755 /usr/local/bin/ssl-ca
 
 clean:
-	rm -rf openssl.cnf certs keys CA.key CA.crt CA.p12
+	rm -rf openssl.cnf certs keys CA.key CA.crt CA.p12 .server.pid
 
 test: clean
 	./ssl-ca init
@@ -28,6 +28,6 @@ test: clean
 	test "$$(openssl x509 -in certs/www -subject -noout)" = "subject= /CN=www.ssl-ca"
 	test "$$(openssl x509 -in certs/smtp -issuer -noout)" = "issuer= /CN=ssl-ca"
 	test "$$(openssl x509 -in certs/smtp -subject -noout)" = "subject= /CN=smtp.ssl-ca"
-	openssl s_server -accept 8080 -cert certs/www -key keys/www -CAfile CA.crt & echo "$$!" > server.pid
-	kill "$$(cat server.pid)"
-	rm server.pid
+	openssl s_server -accept 15876 -cert certs/www -key keys/www -CAfile CA.crt -quiet & echo "$$!" > .server.pid
+	kill "$$(cat .server.pid)"
+	rm .server.pid