diff --git a/jss.spec b/jss.spec
index 05c6e00..1a3e45b 100644
--- a/jss.spec
+++ b/jss.spec
@@ -34,7 +34,7 @@ Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
 
 %define java_devel java-11-openjdk-devel
 %define java_headless java-11-openjdk-headless
-%define java_home /usr/lib/jvm/jre-11-openjdk
+%define java_home %{_jvmdir}/jre-11-openjdk
 
 ################################################################################
 # Build Options
diff --git a/tests/tests.yml b/tests/tests.yml
index 9d0d42b..0d23972 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -8,10 +8,10 @@
     tests:
     - verify_spawn_ca:
         dir: .
-        run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '<Status>running</Status>'"
+        run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '\"Status\" : \"running\"'"
     - verify_spawn_kra:
         dir: .
-        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '<Status>running</Status>'"
+        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '\"Status\" : \"running\"'"
     - destroy_kra:
         dir: .
         run: "pkidestroy -i pki-tomcat -s KRA && sleep 5"