diff --git a/assets/stories/skate-components/routePropertiesCard.stories.tsx b/assets/stories/skate-components/routePropertiesCard.stories.tsx
index 989e97762..2c165c90e 100644
--- a/assets/stories/skate-components/routePropertiesCard.stories.tsx
+++ b/assets/stories/skate-components/routePropertiesCard.stories.tsx
@@ -6,7 +6,7 @@ import { routePatternFactory } from "../../tests/factories/routePattern"
 import routeFactory from "../../tests/factories/route"
 import { RoutesProvider } from "../../src/contexts/routesContext"
 import { stopFactory } from "../../tests/factories/stop"
-import shapeFactory from "../../tests/factories/shape"
+import { shapeFactory } from "../../tests/factories/shape"
 
 const outboundStops = [
   stopFactory.build({ name: "Watertown Square" }),
diff --git a/assets/tests/components/map.test.tsx b/assets/tests/components/map.test.tsx
index acdb3a103..a86cd41eb 100644
--- a/assets/tests/components/map.test.tsx
+++ b/assets/tests/components/map.test.tsx
@@ -33,7 +33,7 @@ import { setHtmlDefaultWidthHeight } from "../testHelpers/leafletMapWidth"
 import { mockScreenSize, mockTileUrls } from "../testHelpers/mockHelpers"
 import { streetViewModeSwitch } from "../testHelpers/selectors/components/mapPage/map"
 import { streetViewUrl } from "../../src/util/streetViewUrl"
-import shapeFactory from "../factories/shape"
+import { shapeFactory } from "../factories/shape"
 import { fullStoryEvent } from "../../src/helpers/fullStory"
 import { recenterControl } from "../testHelpers/selectors/components/map/controls/recenterControl"
 
diff --git a/assets/tests/components/mapPage/mapDisplay.test.tsx b/assets/tests/components/mapPage/mapDisplay.test.tsx
index 1b1a4695b..28a1978c8 100644
--- a/assets/tests/components/mapPage/mapDisplay.test.tsx
+++ b/assets/tests/components/mapPage/mapDisplay.test.tsx
@@ -40,7 +40,7 @@ import {
   mockUsePatternsByIdForVehicles,
 } from "../../testHelpers/mockHelpers"
 
-import shapeFactory from "../../factories/shape"
+import { shapeFactory } from "../../factories/shape"
 import { zoomInButton } from "../../testHelpers/selectors/components/map"
 import { stopIcon } from "../../testHelpers/selectors/components/map/markers/stopIcon"
 import { routePropertiesCard } from "../../testHelpers/selectors/components/mapPage/routePropertiesCard"
diff --git a/assets/tests/components/mapPage/routePropertiesCard.test.tsx b/assets/tests/components/mapPage/routePropertiesCard.test.tsx
index 3ae43632f..6ee9e2895 100644
--- a/assets/tests/components/mapPage/routePropertiesCard.test.tsx
+++ b/assets/tests/components/mapPage/routePropertiesCard.test.tsx
@@ -8,7 +8,7 @@ import RoutePropertiesCard, {
 } from "../../../src/components/mapPage/routePropertiesCard"
 import { routePatternFactory } from "../../factories/routePattern"
 import routeFactory from "../../factories/route"
-import shapeFactory from "../../factories/shape"
+import { shapeFactory } from "../../factories/shape"
 import { stopFactory } from "../../factories/stop"
 
 import { RoutesProvider } from "../../../src/contexts/routesContext"
diff --git a/assets/tests/components/shuttleMapPage.test.tsx b/assets/tests/components/shuttleMapPage.test.tsx
index d757fdbef..66ae3bf3c 100644
--- a/assets/tests/components/shuttleMapPage.test.tsx
+++ b/assets/tests/components/shuttleMapPage.test.tsx
@@ -23,7 +23,7 @@ import { initialState } from "../../src/state"
 import * as dateTime from "../../src/util/dateTime"
 import { shuttleFactory } from "../factories/vehicle"
 import userEvent from "@testing-library/user-event"
-import shapeFactory from "../factories/shape"
+import { shapeFactory } from "../factories/shape"
 import {
   layersControlButton,
   zoomInButton,
diff --git a/assets/tests/factories/routePattern.ts b/assets/tests/factories/routePattern.ts
index ee918763d..7f335d813 100644
--- a/assets/tests/factories/routePattern.ts
+++ b/assets/tests/factories/routePattern.ts
@@ -1,6 +1,6 @@
 import { Factory } from "fishery"
 import { RoutePattern } from "../../src/schedule"
-import shape from "./shape"
+import { shapeFactory } from "./shape"
 
 export const routePatternFactory = Factory.define<RoutePattern>(
   ({ sequence }) => ({
@@ -9,7 +9,7 @@ export const routePatternFactory = Factory.define<RoutePattern>(
     routeId: "66",
     directionId: 0,
     sortOrder: sequence,
-    shape: shape.build(),
+    shape: shapeFactory.build(),
     headsign: `Headsign ${sequence}`,
   })
 )
diff --git a/assets/tests/factories/shape.ts b/assets/tests/factories/shape.ts
index f0023c297..50d494bdb 100644
--- a/assets/tests/factories/shape.ts
+++ b/assets/tests/factories/shape.ts
@@ -2,10 +2,8 @@ import { Factory } from "fishery"
 import { Shape } from "../../src/schedule"
 import { stopFactory } from "./stop"
 
-const shapeFactory = Factory.define<Shape>(({ sequence }) => ({
+export const shapeFactory = Factory.define<Shape>(({ sequence }) => ({
   id: `shape${sequence}`,
   points: [{ lat: 0, lon: 0 }],
   stops: [stopFactory.build({ id: `stop${sequence}` })],
 }))
-
-export default shapeFactory
diff --git a/assets/tests/hooks/useShapes.test.ts b/assets/tests/hooks/useShapes.test.ts
index 767de2824..be6de7cb2 100644
--- a/assets/tests/hooks/useShapes.test.ts
+++ b/assets/tests/hooks/useShapes.test.ts
@@ -4,7 +4,7 @@ import * as Api from "../../src/api"
 import { useRouteShapes, useTripShape } from "../../src/hooks/useShapes"
 import { Shape, Stop } from "../../src/schedule.d"
 import { instantPromise, mockUseStateOnce } from "../testHelpers/mockHelpers"
-import shapeFactory from "../factories/shape"
+import { shapeFactory } from "../factories/shape"
 import { stopFactory } from "../factories/stop"
 
 jest.mock("../../src/api", () => ({
diff --git a/assets/tests/models/shapeData.test.ts b/assets/tests/models/shapeData.test.ts
index 1f61a9fde..dc3f93dd9 100644
--- a/assets/tests/models/shapeData.test.ts
+++ b/assets/tests/models/shapeData.test.ts
@@ -5,7 +5,7 @@ import {
   shapesFromData,
 } from "../../src/models/shapeData"
 import { shapeDataFactory } from "../factories/shape_data"
-import shapeFactory from "../factories/shape"
+import { shapeFactory } from "../factories/shape"
 import { stopDataFactory } from "../factories/stopData"
 import { stopsFromData } from "../../src/models/stopData"
 
diff --git a/assets/tests/models/subwayRoute.test.ts b/assets/tests/models/subwayRoute.test.ts
index 4233b3f11..1f0852a0a 100644
--- a/assets/tests/models/subwayRoute.test.ts
+++ b/assets/tests/models/subwayRoute.test.ts
@@ -4,7 +4,7 @@ import {
   isASubwayRoute,
   subwayRoutes,
 } from "../../src/models/subwayRoute"
-import shapeFactory from "../factories/shape"
+import { shapeFactory } from "../factories/shape"
 import { stopFactory } from "../factories/stop"
 
 const subwayLineIds = ["Blue", "Green", "Orange", "Red", "Mattapan"]
diff --git a/assets/tests/testHelpers/mockHelpers.ts b/assets/tests/testHelpers/mockHelpers.ts
index 2d936703b..0888ca6d3 100644
--- a/assets/tests/testHelpers/mockHelpers.ts
+++ b/assets/tests/testHelpers/mockHelpers.ts
@@ -7,7 +7,7 @@ import { VehicleInScheduledService, Ghost } from "../../src/realtime"
 import { routePatternFactory } from "../factories/routePattern"
 import { stopFactory } from "../factories/stop"
 
-import shape from "../factories/shape"
+import { shapeFactory } from "../factories/shape"
 import { TileType, tilesetUrlForType } from "../../src/tilesetUrls"
 
 /**
@@ -66,7 +66,7 @@ export const mockUsePatternsByIdForVehicles = (
           id: routePatternId!,
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           routeId: routeId!,
-          shape: shape.build({
+          shape: shapeFactory.build({
             stops: stopFactory.buildList(params?.stopCount || 2),
           }),
         })