diff --git a/heketi.spec b/heketi.spec
index e01cedf..d20ee71 100644
--- a/heketi.spec
+++ b/heketi.spec
@@ -9,7 +9,7 @@
 %global with_bundled 1
 %global with_debug 0
 %global with_check 1
-%global with_unit_test 0
+%global with_unit_test 1
 %endif
 
 # Determine if systemd will be used
@@ -206,19 +206,11 @@ export GOPATH=$(pwd):%{gopath}:$(pwd)/Godeps/_workspace
 %define gohash %(head -c20 /dev/urandom | od -An -tx1 | tr -d '\ \\n')
 
 # -s strips debug information
-%if 0%{?rhel} && 0%{?rhel} > 6
-go build -ldflags "-X main.HEKETI_VERSION %{version} -B 0x%{gohash} -s" -o %{name}
-
-cd client/cli/go
-go build -ldflags "-X main.HEKETI_CLI_VERSION %{version} -B 0x%{gohash} -s" -o %{name}-cli
-cd ../../..
-%else
 go build -ldflags "-X main.HEKETI_VERSION=%{version} -B 0x%{gohash} -s" -o %{name}
 
 cd client/cli/go
 go build -ldflags "-X main.HEKETI_CLI_VERSION=%{version} -B 0x%{gohash} -s" -o %{name}-cli
 cd ../../..
-%endif
 
 %endif