diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/CentralRepoSettings.java b/Core/src/org/sleuthkit/autopsy/centralrepository/CentralRepoSettings.java
index b7ec071f27..d24b6245a6 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/CentralRepoSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/CentralRepoSettings.java
@@ -44,6 +44,8 @@ public class CentralRepoSettings {
 
     private static final String DEFAULT_DB_PARENT_PATH = Paths.get(CENTRAL_REPO_BASE_PATH, "LocalDatabase").toString();
     private static final String DEFAULT_DB_NAME = "central_repository.db";
+
+    // NOTE: if this changes, an equivalent fix will be needed in CentralRepoDatamodelTest for the String PROPERTIES_FILE
     private static final String MODULE_SETTINGS_KEY = Paths.get(
             Paths.get(PlatformUtil.getUserConfigDirectory()).relativize(Paths.get(PlatformUtil.getModuleConfigDirectory())).toString(),
             CENTRAL_REPOSITORY_FOLDER,
diff --git a/Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java b/Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java
index dab8969c94..beb3e71207 100644
--- a/Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java
@@ -43,6 +43,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
 import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.util.Comparator;
 
 /**
  * Finds and loads Autopsy modules written using the Jython variant of the
@@ -124,6 +125,8 @@ public final class JythonModuleLoader {
                 }
             }
         }
+        
+        Collections.sort(objects, Comparator.comparing((T obj) -> obj.getClass().getSimpleName(), (s1, s2) -> s1.compareToIgnoreCase(s2)));
         return objects;
     }
 
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
index d4b188d7db..c2c122f1fa 100755
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
@@ -43,7 +43,6 @@ import org.sleuthkit.autopsy.casemodule.CaseDetails;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
-import org.sleuthkit.autopsy.centralrepository.CentralRepoSettings;
 import org.sleuthkit.autopsy.coreutils.FileUtil;
 
 /**
@@ -57,7 +56,10 @@ import org.sleuthkit.autopsy.coreutils.FileUtil;
  */
 public class CentralRepoDatamodelTest extends TestCase {
 
-    private static final String PROPERTIES_FILE = CentralRepoSettings.getInstance().getModuleSettingsKey();
+    // Classloader for qa functional tests is having trouble with loading NbBundle.  
+    // Path is hard-coded to avoid that issue instead of using 
+    // CentralRepoSettings.getInstance().getModuleSettingsKey()
+    private static final String PROPERTIES_FILE = "ModuleConfig/CentralRepository/CentralRepository";
     private static final String CR_DB_NAME = "testcentralrepo.db";
 
     private static final Path testDirectory = Paths.get(System.getProperty("java.io.tmpdir"), "CentralRepoDatamodelTest");