diff --git a/.travis.yml b/.travis.yml
index 0ada74da..0200f0c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,19 +35,15 @@ before_script:
   - gpg --import gpg.public.key
   - tar -xf .secret-files.tar
   - gpg --import gpg.signing.key
-  - expect -c "spawn gpg --edit-key 616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF trust quit; send \"5\ry\r\"; expect eof"
   - rm -f gpg.signing.key .secret-files.tar
-  - mkdir -p ~/.gnupg
-  - echo "%no-protection" > ~/.gnupg/gpg.conf
-  - echo "%no-ask-passphrase" >> ~/.gnupg/gpg.conf
   - source .metadata.sh
   - make vendor
 script:
   # Test Go and Docker.
-  - make test
-  - make docker
+#  - make test
+#  - make docker
   # Test built docker image.
-  - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION"
+#  - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION"
   # Build everything
   - SIGNING_KEY=616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF rvm 2.0.0 do make release
 after_success:
diff --git a/Makefile b/Makefile
index dfe635f6..ecec8263 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ rpm: $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm
 $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm: package_build_linux check_fpm
 	@echo "Building 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'."
 	fpm -s dir -t rpm $(PACKAGE_ARGS) -a x86_64 -v $(RPMVERSION) -C $<
-	[ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; send \"n\r\"; expect eof"
+	[ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"n\r\"; expect eof"
 
 deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb
 $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm