diff --git a/jss.spec b/jss.spec
index 887b827..a0610a9 100644
--- a/jss.spec
+++ b/jss.spec
@@ -3,7 +3,7 @@
 
 Name:           jss
 Version:        4.4.0
-Release:        0.7%{?dist}
+Release:        0.8%{?dist}
 Summary:        Java Security Services (JSS)
 
 Group:          System Environment/Libraries
@@ -274,39 +274,22 @@ if [ "x$SKIP_TESTS" == "x" ]; then
   export JAVA_HOME=/etc/alternatives/java_sdk_1.8.0_openjdk
   export USE_64=1
 
-  # build nss:
-  pushd nss
-  make clean nss_build_all
-  popd
-
-  # Now build jss:
-  # You'll need this hacks so it find plarena.h
-  export NSPR_INCLUDE_DIR=/usr/include/nspr4
-  #  export NSS_INCLUDE_DIR=/usr/include/nss3
+  # Build jss:
   pushd jss
   make clean all
   popd
 
   # You need to make the following work, commands automation script executes:
   pushd jss
-  # Instead of Kai's % export PLATFORM=`make platform` do Christina's hack
-  export PLATFORM=Linux%{majorrel}.%{minorrel}_x86_64_glibc_PTH_64_DBG.OBJ
+
   popd
   export HGDIR=`pwd`
-  # To prevent failures use this hack
-  pushd dist
-  mkdir -p mkdir Linux%{majorrel}.%{minorrel}_x86_64_glibc_PTH_64_DBG.OBJ/bin
-  mkdir -p mkdir Linux%{majorrel}.%{minorrel}_x86_64_glibc_PTH_64_DBG.OBJ/lib
-  pushd Linux%{majorrel}.%{minorrel}_x86_64_cc_glibc_PTH_64_DBG.OBJ
-  cp -r * ../Linux%{majorrel}.%{minorrel}_x86_64_glibc_PTH_64_DBG.OBJ
-  popd
-  popd
-  pushd jss/org/mozilla/jss/tests
-  perl all.pl dist $HGDIR/dist/$PLATFORM 1> $RPM_BUILD_ROOT/../run.log 2>&1
-  pushd $HGDIR
+  #  Run JSS tests (Linux and macOS only):
+  cd jss
+  make test_jss 1> $RPM_BUILD_ROOT/../run.log 2>&1
 
-   TAIL=`/usr/bin/tail -4 $RPM_BUILD_ROOT/../run.log`
-   echo $TAIL
+  TAIL=`/usr/bin/tail -4 $RPM_BUILD_ROOT/../run.log`
+  echo $TAIL
 
   #  /home/emaldona/sandbox/dist/xpclass_dbg.jar needs to be copied
   if [ "x$SKIP_JSS_TEST_SUITE" == "x" ]; then
@@ -388,6 +371,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 19 2017 Elio Maldonado <emaldona@redhat.com> - 4.4.0-0.8
+- Use a cleaner method for testing in %%check phase
+- see https://bugzilla.mozilla.org/show_bug.cgi?id=1322364
+
 * Mon Dec 19 2016 Elio Maldonado <emaldona@redhat.com> - 4.4.0-0.7
 - Use majorrel and minorrel when copying in %%check phase