diff --git a/src/tools/worldbuild.lisp b/src/tools/worldbuild.lisp
index cb2b6353aaa482eb8c3bf470982e635a05012814..7dd0381cbea011e6b9827ed1d4b732e03488590f 100644
--- a/src/tools/worldbuild.lisp
+++ b/src/tools/worldbuild.lisp
@@ -127,7 +127,6 @@
 	     '("target:code/rand-xoroshiro"))
 	    (t
 	     '("target:code/rand")))
-    "target:code/rand-xoroshiro"
     "target:code/alieneval"
     "target:code/c-call"
     "target:code/sap"
diff --git a/src/tools/worldload.lisp b/src/tools/worldload.lisp
index 16365e7878bdede57093f6ee6ef284b8b1e47814..f1064df35bae9544d7d82aea63c2d6eaf5466e9f 100644
--- a/src/tools/worldload.lisp
+++ b/src/tools/worldload.lisp
@@ -102,7 +102,6 @@
 (maybe-byte-load "code:rand-xoroshiro")
 #-(or random-mt19937 random-xoroshiro)
 (maybe-byte-load "code:rand")
-(maybe-byte-load "code:rand-xoroshiro")
 (maybe-byte-load "target:pcl/walk")
 (maybe-byte-load "code:fwrappers")
 (maybe-byte-load "code:ntrace")
diff --git a/tests/rng.lisp b/tests/rng.lisp
index 1b5dcbcaf52852a18f0db42c58de9820b730341e..a02285a7accd6dfd482bd1496327a87eae73753f 100644
--- a/tests/rng.lisp
+++ b/tests/rng.lisp
@@ -20,6 +20,13 @@
 
 (defvar *test-state*)
   
+(define-test rng.state
+  (let ((s (kernel::random-state-state *random-state*)))
+    #+random-xoroshiro
+    (assert-true (typep s '(simple-array double-float (2))))
+    #+random-mt19937
+    (assert-true (typep s '(simple-array (unsigned-byte 32) (627))))))
+
 #+random-xoroshiro
 (define-test rng.initial-state
   (setf *test-state*
@@ -56,6 +63,7 @@
       (assert-equal value (64-bit-value *test-state*))
       (assert-equal state (multiple-value-list (64-bit-rng-state *test-state*))))))
 
+#+random-xoroshiro
 (define-test rng.jump
   (setf *test-state*
 	(kernel::make-random-object :state (kernel::init-random-state #x12345678)
@@ -68,3 +76,4 @@
     (kernel:random-state-jump *test-state*)
     (assert-equal result (multiple-value-list
 			  (64-bit-rng-state *test-state*)))))
+