diff --git a/.gitignore b/.gitignore
index 9498959..daed2c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/go-go-1.14.7-1-openssl-fips.tar.gz
+SOURCES/go-go-1.14.7-2-openssl-fips.tar.gz
diff --git a/.golang.metadata b/.golang.metadata
index 503afcd..26fb63d 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1 +1 @@
-34b2d4c5b30d51d1a02c6cea91dc27ce9dac88b6 SOURCES/go-go-1.14.7-1-openssl-fips.tar.gz
+c8bffb54b2928e9d95eab76e148cdebd6dc88701 SOURCES/go-go-1.14.7-2-openssl-fips.tar.gz
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index 95b6d2c..53a6a4b 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -97,11 +97,11 @@
 
 %global go_api 1.14
 %global go_version 1.14.7
-%global pkg_release 1
+%global pkg_release 2
 
 Name:           golang
 Version:        %{go_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -436,9 +436,9 @@ export GO_TEST_RUN=""
 export GOLANG_FIPS=1
 pushd crypto
   # Run all crypto tests but skip TLS, we will run FIPS specific TLS tests later
-  go test $(go list | grep -v tls) -v
+  go test $(go list ./... | grep -v tls) -v
   # Check that signature functions have parity between boring and notboring
-  CGO_ENABLED=0 go test ./ecdsa
+  CGO_ENABLED=0 go test $(go list ./... | grep -v tls) -v
 popd
 # Run all FIPS specific TLS tests
 pushd crypto/tls
@@ -505,6 +505,10 @@ cd ..
 %endif
 
 %changelog
+* Thu Aug 27 2020 Alejandro Sáez <asm@redhat.com> - 1.14.7-2
+- Improve test suit
+- Resolves: rhbz#1854693
+
 * Tue Aug 18 2020 Alejandro Sáez <asm@redhat.com> - 1.14.7-1
 - Rebase to 1.14.7