Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -r1.28.2.23 -r1.28.2.24
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	14 Dec 2021 09:51:11 -0000	1.28.2.23
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	14 Dec 2021 10:04:39 -0000	1.28.2.24
@@ -1258,11 +1258,13 @@
     } {
         # Retrieve dependencies for every package known to the system
         foreach package_key [db_list get_packages {
-            select package_key from apm_package_types
+            select package_key from apm_package_types p
+            where exists (select 1 from apm_package_version_info
+                           where package_key = p.package_key
+                             and enabled_p)
         }] {
-            lappend dependencies($package_key) \
-                $package_key \
-                {*}[apm_package_load_libraries_order $package_key]
+            set dependencies($package_key) \
+                [apm_package_load_libraries_order $package_key]
         }
 
         # Create a lookup array for every message key on the system to
Index: openacs-4/packages/acs-tcl/tcl/test/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/Attic/apm-procs.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/acs-tcl/tcl/test/apm-procs.tcl	14 Dec 2021 09:51:10 -0000	1.1.2.2
+++ openacs-4/packages/acs-tcl/tcl/test/apm-procs.tcl	14 Dec 2021 10:04:39 -0000	1.1.2.3
@@ -14,7 +14,10 @@
         expected result from the data model.
     } {
         foreach package_key [db_list get_packages {
-            select package_key from apm_package_types
+            select package_key from apm_package_types p
+            where exists (select 1 from apm_package_version_info
+                           where package_key = p.package_key
+                             and enabled_p)
         }] {
             set db_dependencies [db_list get_dependencies {
                 with recursive dependencies as