diff --git a/Integrations/build.gradle b/Integrations/build.gradle
index ec27eb8e7c7..41d99e895d3 100644
--- a/Integrations/build.gradle
+++ b/Integrations/build.gradle
@@ -19,6 +19,7 @@ dependencies {
     implementation project(':log-factory')
 
     testImplementation project(':engine-test-utils')
+    testImplementation TestTools.projectDependency(project, 'engine-time')
 
     testRuntimeOnly project(':log-to-slf4j')
     // add configs, and some runtime dependencies to test classpaths
diff --git a/Integrations/src/test/java/io/deephaven/integrations/python/CalendarsHelper.java b/Integrations/src/test/java/io/deephaven/integrations/python/CalendarsHelper.java
deleted file mode 100644
index 85aaef69ebd..00000000000
--- a/Integrations/src/test/java/io/deephaven/integrations/python/CalendarsHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
- */
-package io.deephaven.integrations.python;
-
-import io.deephaven.time.calendar.BusinessCalendar;
-import io.deephaven.time.calendar.Calendars;
-import io.deephaven.util.annotations.ScriptApi;
-
-public final class CalendarsHelper {
-
-    /**
-     * This invokes {@link Calendars#addCalendar(BusinessCalendar)} for all the
-     * {@link Calendars#calendarsFromConfiguration()}.
-     */
-    @ScriptApi
-    public static void addCalendarsFromConfiguration() {
-        for (BusinessCalendar calendar : Calendars.calendarsFromConfiguration()) {
-            Calendars.addCalendar(calendar);
-        }
-    }
-}
diff --git a/Plot/Plot.gradle b/Plot/Plot.gradle
index 51bbc7d2710..1d6a6068bfa 100644
--- a/Plot/Plot.gradle
+++ b/Plot/Plot.gradle
@@ -27,6 +27,7 @@ dependencies {
 
     testImplementation TestTools.projectDependency(project, 'Util')
     testImplementation TestTools.projectDependency(project, 'engine-table')
+    testImplementation TestTools.projectDependency(project, 'engine-time')
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
diff --git a/Plot/src/test/java/io/deephaven/plot/axistransformations/CalendarInit.java b/Plot/src/test/java/io/deephaven/plot/axistransformations/CalendarInit.java
deleted file mode 100644
index f74318612d6..00000000000
--- a/Plot/src/test/java/io/deephaven/plot/axistransformations/CalendarInit.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
- */
-package io.deephaven.plot.axistransformations;
-
-import io.deephaven.time.calendar.BusinessCalendar;
-import io.deephaven.time.calendar.Calendars;
-
-
-final class CalendarInit {
-    private static volatile boolean initialized = false;
-
-    /**
-     * This is a guarded initialization of {@link Calendars#addCalendar(BusinessCalendar)} for all the
-     * {@link Calendars#calendarsFromConfiguration()}.
-     */
-    static void init() {
-        if (!initialized) {
-            synchronized (CalendarInit.class) {
-                if (!initialized) {
-                    for (BusinessCalendar calendar : Calendars.calendarsFromConfiguration()) {
-                        Calendars.addCalendar(calendar);
-                    }
-                    initialized = true;
-                }
-            }
-        }
-    }
-}
diff --git a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java
index db98b3b82c0..f782d0e2c00 100644
--- a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java
+++ b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransformBusinessCalendar.java
@@ -4,6 +4,7 @@
 package io.deephaven.plot.axistransformations;
 
 import io.deephaven.time.DateTimeUtils;
+import io.deephaven.time.calendar.CalendarInit;
 import io.deephaven.time.calendar.Calendars;
 import junit.framework.TestCase;
 
diff --git a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java
index 63a2ac19c29..c8c9c45126a 100644
--- a/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java
+++ b/Plot/src/test/java/io/deephaven/plot/axistransformations/TestAxisTransforms.java
@@ -4,6 +4,7 @@
 package io.deephaven.plot.axistransformations;
 
 import io.deephaven.time.calendar.BusinessCalendar;
+import io.deephaven.time.calendar.CalendarInit;
 import io.deephaven.time.calendar.Calendars;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/CalendarInit.java b/engine/time/src/test/java/io/deephaven/time/calendar/CalendarInit.java
index 912da2c94ab..3fb0cc9c3a1 100644
--- a/engine/time/src/test/java/io/deephaven/time/calendar/CalendarInit.java
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/CalendarInit.java
@@ -3,7 +3,7 @@
  */
 package io.deephaven.time.calendar;
 
-final class CalendarInit {
+public final class CalendarInit {
 
     private static volatile boolean initialized = false;
 
@@ -11,7 +11,7 @@ final class CalendarInit {
      * This is a guarded initialization of {@link Calendars#addCalendar(BusinessCalendar)} for all the
      * {@link Calendars#calendarsFromConfiguration()}.
      */
-    static void init() {
+    public static void init() {
         if (!initialized) {
             synchronized (CalendarInit.class) {
                 if (!initialized) {
diff --git a/py/server/tests/test_calendar.py b/py/server/tests/test_calendar.py
index bff9f704626..a2a4813c4f3 100644
--- a/py/server/tests/test_calendar.py
+++ b/py/server/tests/test_calendar.py
@@ -18,8 +18,7 @@ class CalendarTestCase(BaseTestCase):
     @classmethod
     def setUpClass(cls) -> None:
         super().setUpClass()
-        jpy.get_type('io.deephaven.integrations.python.CalendarsHelper').addCalendarsFromConfiguration()
-
+        jpy.get_type('io.deephaven.time.calendar.CalendarInit').init()
 
     def setUp(self) -> None:
         super().setUp()