diff --git a/.travis.yml b/.travis.yml
index 457669c3..ee0bb1b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,20 @@ services:
 env:
     global:
         - PARALLELMFLAGS="-j4"
+          OPENSSL_UPSTREAM=old/1.1.1/openssl-1.1.1d.tar.gz
+          OPENSSL_SHA1=056057782325134b76d1931c48f2c7e6595d7ef4
+          INSTALL_SPHINX="yes"
+
     matrix:
-        - INSTALL_SPHINX=""
-          OPENSSL_FLAGS=""
+        - OPENSSL_FLAGS=no-ec
+
+        - OPENSSL_FLAGS=
+          INSTALL_SPHINX=
 
         - INSTALL_SPHINX="yes"
-        - OPENSSL_FLAGS=no-ec
+
+        - OPENSSL_UPSTREAM=openssl-3.0.0-alpha16.tar.gz
+          OPENSSL_SHA1=9719fde1203a21f768c5688dd7bd579c6b5a8ae4
 
 script:
     - docker build --rm
diff --git a/Dockerfile b/Dockerfile
index ad249e56..45a7493f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,8 @@ RUN set -x \
 		qt5-default \
 		qtbase5-dev \
 		qtbase5-dev-tools \
+		qttools5-dev \
+		qttools5-dev-tools \
 		x11-apps \
 		python3-pip
 
diff --git a/lib/db_x509.cpp b/lib/db_x509.cpp
index c3f9a719..5288efcc 100644
--- a/lib/db_x509.cpp
+++ b/lib/db_x509.cpp
@@ -560,7 +560,7 @@ void db_x509::store(QModelIndexList list)
 	if (list.size() == 0)
 		return;
 
-	pki_x509 *oldcrt, *crt = fromIndex<pki_x509>(list[0]);
+	pki_x509 *oldcrt = nullptr, *crt = fromIndex<pki_x509>(list[0]);
 	if (!crt)
 		return;
 
diff --git a/lib/pki_key.cpp b/lib/pki_key.cpp
index da8fff51..e959dc23 100644
--- a/lib/pki_key.cpp
+++ b/lib/pki_key.cpp
@@ -92,11 +92,11 @@ QByteArray pki_key::i2d() const
 void pki_key::write_SSH2_ed25519_private(BIO *b,
 			 const EVP_PKEY *pkey, const EVP_CIPHER *enc) const
 {
+	(void)enc;
 #ifndef OPENSSL_NO_EC
 	static const char data0001[] = { 0, 0, 0, 1};
 	char buf_nonce[8];
 	QByteArray data, priv, pubfull;
-	(void)enc;
 
 	pubfull = SSH2publicQByteArray(true);
 	RAND_bytes((unsigned char*)buf_nonce, sizeof buf_nonce);
@@ -116,6 +116,9 @@ void pki_key::write_SSH2_ed25519_private(BIO *b,
 	PEM_write_bio(b, PEM_STRING_OPENSSH_KEY, (char*)"",
 		(unsigned char*)(data.data()), data.size());
 	pki_openssl_error();
+#else
+	(void)b;
+	(void)pkey;
 #endif
 }