diff --git a/Makefile b/Makefile
index 1e9eb5a1..8f5e9b3e 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,7 @@ endif
 
 APPLICATION_NAME_LOWERCASE = $(shell echo $(APPLICATION_NAME) | tr A-Z a-z)
 APPLICATION_VERSION_DEBIAN = $(shell echo $(APPLICATION_VERSION) | tr "-" "~")
-APPLICATION_VERSION_REDHAT = $(shell echo $(APPLICATION_VERSION) | tr "-" "~")
+APPLICATION_VERSION_REDHAT = $(APPLICATION_VERSION)
 
 # ---------------------------------------------------------------------
 # Release type
diff --git a/tests/spectron/runner.spec.js b/tests/spectron/runner.spec.js
index b3f8ba78..7e475676 100644
--- a/tests/spectron/runner.spec.js
+++ b/tests/spectron/runner.spec.js
@@ -36,6 +36,7 @@ describe('Spectron', function () {
   before('app:start', function () {
     app = new spectron.Application({
       path: entrypoint,
+      port: 9999,
       args: [ '.' ]
     })