Index: openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl,v
diff -u -r1.34.2.2 -r1.34.2.3
--- openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	21 Jan 2020 12:03:40 -0000	1.34.2.2
+++ openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	23 May 2020 10:56:36 -0000	1.34.2.3
@@ -152,9 +152,11 @@
     apm_bootstrap_load_libraries -init acs-tcl
 
     # LARS: Load packages/acs-automated-testing/tcl/aa-test-procs.tcl
-    ns_log Notice "Loading acs-automated-testing specially so other packages can define tests..."
-    apm_bootstrap_load_libraries -procs acs-automated-testing
-
+    if {[apm_load_tests_p]} {
+        ns_log Notice "Loading acs-automated-testing specially so other packages can define tests..."
+        apm_bootstrap_load_libraries -procs acs-automated-testing
+    }
+    
     # Build the list of subsite packages
     apm_build_subsite_packages_list
 
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.114.2.10 -r1.114.2.11
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	18 May 2020 21:20:20 -0000	1.114.2.10
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	23 May 2020 10:56:36 -0000	1.114.2.11
@@ -521,8 +521,8 @@
     Loads all -procs.tcl (if $procs_or_init is "procs") or -init.tcl  files into the
     current interpreter for installed, enabled packages. Only loads
     files which have not yet been loaded. This is intended to be called only during server
-    initialization (since it loads libraries only into the running interpreter, as opposed
-                    to in *all* active interpreters).
+    initialization, since it loads libraries only into the running interpreter, as opposed
+    to in *all* active interpreters.
 
 } {
     set file_types [list]
@@ -577,9 +577,9 @@
     {-load_queries_p 1}
     {-packages {}}
 } {
-    Load Tcl libraries and queries for the packages with given keys. Only
-    loads procs into the current interpreter. Will
-    load Tcl tests if the acs-automated-testing package is enabled.
+    Load Tcl libraries and queries for the packages with given
+    keys into the current interpreter. Will load Tcl
+    tests when the acs-automated-testing package is enabled.
 
     @param force_reload Reload Tcl libraries even if they are already loaded.
     @param load_libraries_p Switch to indicate if Tcl libraries in (-procs.tcl and -init.tcl)
@@ -594,14 +594,18 @@
 
     @author Peter Marklund
 } {
+    set enabled_packages [apm_enabled_packages]
     if { $packages eq "" } {
-        set packages [apm_enabled_packages]
+        set packages $enabled_packages
     }
 
     set packages_to_load [list]
     foreach package_key $packages {
         foreach package_to_load [::apm_package_load_libraries_order $package_key] {
-            if {$package_to_load ni $packages_to_load} {
+            #
+            # Never add packages, which are not enabled.
+            # 
+            if {$package_to_load ni $packages_to_load && $package_to_load in $enabled_packages} {
                 lappend packages_to_load $package_to_load
             }
         }