diff --git a/lib/hx509/ChangeLog b/lib/hx509/ChangeLog
index 25b5ae2d9..71a78b1c9 100644
--- a/lib/hx509/ChangeLog
+++ b/lib/hx509/ChangeLog
@@ -1,5 +1,9 @@
 2007-01-11  Love Hörnquist Åstrand  <lha@it.su.se>
 
+	* no random, no RSA/DH tests
+
+	* hxtool.c (info): print status of random generator
+
 	* Makefile.am: remove files created by tests
 
 	* error.c: constify
diff --git a/lib/hx509/test_ca.in b/lib/hx509/test_ca.in
index d9897c267..eaa497459 100644
--- a/lib/hx509/test_ca.in
+++ b/lib/hx509/test_ca.in
@@ -40,6 +40,9 @@ hxtool="${TESTS_ENVIRONMENT} ./hxtool"
 if ${hxtool} info | grep 'rsa: hcrypto null RSA' > /dev/null ; then
     exit 77
 fi
+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
+    exit 77
+fi
 
 echo "create certificate request"
 ${hxtool} request-create \
diff --git a/lib/hx509/test_chain.in b/lib/hx509/test_chain.in
index ebf4d26ce..da2202324 100644
--- a/lib/hx509/test_chain.in
+++ b/lib/hx509/test_chain.in
@@ -40,6 +40,9 @@ hxtool="${TESTS_ENVIRONMENT} ./hxtool"
 if ${hxtool} info | grep 'rsa: hcrypto null RSA' > /dev/null ; then
     exit 77
 fi
+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
+    exit 77
+fi
 
 echo "cert -> root"
 ${hxtool} verify --missing-revoke \
diff --git a/lib/hx509/test_cms.in b/lib/hx509/test_cms.in
index 3e95fd725..d6297397c 100644
--- a/lib/hx509/test_cms.in
+++ b/lib/hx509/test_cms.in
@@ -41,6 +41,9 @@ hxtool="${TESTS_ENVIRONMENT} ./hxtool"
 if ${hxtool} info | grep 'rsa: hcrypto null RSA' > /dev/null ; then
     exit 77
 fi
+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
+    exit 77
+fi
 
 echo "create signed data"
 ${hxtool} cms-create-sd \
diff --git a/lib/hx509/test_crypto.in b/lib/hx509/test_crypto.in
index 652a8ca32..f775ad17a 100644
--- a/lib/hx509/test_crypto.in
+++ b/lib/hx509/test_crypto.in
@@ -41,6 +41,10 @@ hxtool="${TESTS_ENVIRONMENT} ./hxtool"
 if ${hxtool} info | grep 'rsa: hcrypto null RSA' > /dev/null ; then
     exit 77
 fi
+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
+    exit 77
+fi
+
 
 echo "Bleichenbacher good cert (from eay)"
 ${hxtool} verify --missing-revoke \
diff --git a/lib/hx509/test_nist.in b/lib/hx509/test_nist.in
index e6a507e93..a260edd40 100644
--- a/lib/hx509/test_nist.in
+++ b/lib/hx509/test_nist.in
@@ -42,6 +42,9 @@ hxtool="${TESTS_ENVIRONMENT} ./hxtool"
 if ${hxtool} info | grep 'rsa: hcrypto null RSA' > /dev/null ; then
     exit 77
 fi
+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
+    exit 77
+fi
 
 echo "nist tests"
 
diff --git a/lib/hx509/test_req.in b/lib/hx509/test_req.in
index 6c5000961..8b956c697 100644
--- a/lib/hx509/test_req.in
+++ b/lib/hx509/test_req.in
@@ -41,6 +41,9 @@ hxtool="${TESTS_ENVIRONMENT} ./hxtool"
 if ${hxtool} info | grep 'rsa: hcrypto null RSA' > /dev/null ; then
     exit 77
 fi
+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
+    exit 77
+fi
 
 ${hxtool} request-create \
 	 --subject="CN=Love,DC=it,DC=su,DC=se" \
diff --git a/tests/ChangeLog b/tests/ChangeLog
index c68d1208d..186c4a0eb 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 2007-01-11  Love Hörnquist Åstrand  <lha@it.su.se>
 
+	* no random, no RSA/DH tests
+
 	* plugin/Makefile.am: remove files created by tests
 
 	* gss/Makefile.am: remove files created by tests
diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
index ebd4940fa..6e5d492c7 100644
--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -270,6 +270,9 @@ pkinit=no
 if ${hxtool} info | grep 'rsa: hx509 null RSA' > /dev/null ; then
     rsa=no
 fi
+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
+    rsa=no
+fi
 if ${kinit} --help 2>&1 | grep "CA certificates" > /dev/null; then
     pkinit=yes
 fi
diff --git a/tests/kdc/check-pkinit.in b/tests/kdc/check-pkinit.in
index cb74d2028..51e1ea0f1 100644
--- a/tests/kdc/check-pkinit.in
+++ b/tests/kdc/check-pkinit.in
@@ -68,6 +68,10 @@ pkinit=no
 if ${hxtool} info | grep 'rsa: hx509 null RSA' > /dev/null ; then
     rsa=no
 fi
+if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
+    rsa=no
+fi
+
 if ${kinit} --help 2>&1 | grep "CA certificates" > /dev/null; then
     pkinit=yes
 fi