diff --git a/ci.nix b/ci.nix
index 9b95f817..2cc8b66e 100644
--- a/ci.nix
+++ b/ci.nix
@@ -21,6 +21,7 @@ in
       xo-arena
       xo-facet
       xo-printable2
+      xo-testutil
       xo-alloc2
       xo-refcnt
       xo-reflect
@@ -28,7 +29,6 @@ in
       xo-object2
       xo-gc
       xo-allocutil
-      xo-testutil
       xo-ratio
       xo-unit
       xo-callback
diff --git a/shells.nix b/shells.nix
index 95d49679..26bc9504 100644
--- a/shells.nix
+++ b/shells.nix
@@ -316,29 +316,29 @@ in
 
   xo = {
     cmake          = pkgs.xo-cmake;
-    indentlog      = pkgs.xo-indentlog;
     subsys         = pkgs.xo-subsys;
-    flatstring     = pkgs.xo-flatstring;
+    indentlog      = pkgs.xo-indentlog;
     randomgen      = pkgs.xo-randomgen;
+    flatstring     = pkgs.xo-flatstring;
     reflectutil    = pkgs.xo-reflectutil;
     arena          = pkgs.xo-arena;
     facet          = pkgs.xo-facet;
+    printable2     = pkgs.xo-printable2;
+    testutil       = pkgs.xo-testutil;
     alloc2         = pkgs.xo-alloc2;
+    refcnt         = pkgs.xo-refcnt;
+    reflect        = pkgs.xo-reflect;
+    stringtable2   = pkgs.xo-stringtable2;
     object2        = pkgs.xo-object2;
     gc             = pkgs.xo-gc;
     allocutil      = pkgs.xo-allocutil;
-    refcnt         = pkgs.xo-refcnt;
-    testutil       = pkgs.xo-testutil;
     pyutil         = pkgs.xo-pyutil;
-    reflect        = pkgs.xo-reflect;
     pyreflect      = pkgs.xo-pyreflect;
     ratio          = pkgs.xo-ratio;
     unit           = pkgs.xo-unit;
     pyunit         = pkgs.xo-pyunit;
     callback       = pkgs.xo-callback;
-    printable2     = pkgs.xo-printable2;
     alloc          = pkgs.xo-alloc;
-    stringtable2   = pkgs.xo-stringtable2;
     object         = pkgs.xo-object;
     type           = pkgs.xo-type;
     procedure2     = pkgs.xo-procedure2;
diff --git a/xo-cmake/etc/xo/subsystem-list b/xo-cmake/etc/xo/subsystem-list
index 409b7ea4..12872e86 100644
--- a/xo-cmake/etc/xo/subsystem-list
+++ b/xo-cmake/etc/xo/subsystem-list
@@ -9,13 +9,15 @@ xo-facet
 xo-printable2
 xo-testutil
 xo-alloc2
+xo-refcnt
+xo-reflect
+xo-stringtable2
+xo-object2
 xo-gc
 xo-alloc
 xo-object
-xo-refcnt
 xo-ordinaltree
 xo-pyutil
-xo-reflect
 xo-pyreflect
 xo-ratio
 xo-unit
diff --git a/xo.nix b/xo.nix
index 58854f28..9a1b344f 100644
--- a/xo.nix
+++ b/xo.nix
@@ -34,6 +34,7 @@ let
     xo-arena          = callPackage pkgs/xo-arena.nix          { stdenv = jitStdenv; buildDocs = true; };
     xo-facet          = callPackage pkgs/xo-facet.nix          { stdenv = jitStdenv; };
     xo-printable2     = callPackage pkgs/xo-printable2.nix     { stdenv = jitStdenv; };
+    xo-testutil       = callPackage pkgs/xo-testutil.nix       { stdenv = jitStdenv; };
     xo-alloc2         = callPackage pkgs/xo-alloc2.nix         { stdenv = jitStdenv; buildDocs = true; };
     xo-refcnt         = callPackage pkgs/xo-refcnt.nix         { stdenv = jitStdenv; };
     xo-reflect        = callPackage pkgs/xo-reflect.nix        { stdenv = jitStdenv; };
@@ -41,7 +42,6 @@ let
     xo-object2        = callPackage pkgs/xo-object2.nix        { stdenv = jitStdenv; };
     xo-gc             = callPackage pkgs/xo-gc.nix             { stdenv = jitStdenv; buildDocs = true; };
     xo-allocutil      = callPackage pkgs/xo-allocutil.nix      { stdenv = jitStdenv; };
-    xo-testutil       = callPackage pkgs/xo-testutil.nix       { stdenv = jitStdenv; };
     xo-pyutil         = callPackage pkgs/xo-pyutil.nix         { stdenv = jitStdenv; };
     xo-pyreflect      = callPackage pkgs/xo-pyreflect.nix      { stdenv = jitStdenv; };
     xo-ratio          = callPackage pkgs/xo-ratio.nix          { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };