diff --git a/.gitignore b/.gitignore
index 5cc98fb1..b8451658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@
 /dist
 /storybook-static
 
+# Ignore yalc generated files
+yalc.lock
+/.yalc
 
 /formik*.js
 /formik.js.LICENSE.txt
diff --git a/jest.config.js b/jest.config.js
index 4b9467c3..73c02759 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -18,9 +18,13 @@ module.exports = () => ({
       __dirname,
       "node_modules/@bigbinary/neeto-icons/dist/neeto-icons.js"
     ),
-    neetocist: path.resolve(
+    "^(@bigbinary/neeto-cist|neetocist)$": path.resolve(
       __dirname,
-      "node_modules/@bigbinary/neeto-cist/index.cjs.js"
+      "node_modules/@bigbinary/neeto-cist/index.mjs"
+    ),
+    "^(@bigbinary/neeto-cist|neetocist)/(.*)$": path.resolve(
+      __dirname,
+      "node_modules/@bigbinary/neeto-cist/$2.js"
     ),
     "^atoms/(.*)$": path.resolve(__dirname, "src/atoms", "$1"),
     "^components/(.*)$": path.resolve(__dirname, "src/components", "$1"),
@@ -33,8 +37,9 @@ module.exports = () => ({
     "^src/(.*)$": path.resolve(__dirname, "src", "$1"),
   },
   transformIgnorePatterns: [
-    "/node_modules/(?!(@babel|@bigbinary/neeto-icons|rc-picker|rc-util))",
+    "/node_modules/(?!(@babel|@bigbinary/neeto-icons|rc-picker|rc-util|@bigbinary/neeto-cist))",
   ],
+  transform: { "^.+\\.m?jsx?$": "babel-jest" },
   testEnvironment: "jsdom",
   setupFilesAfterEnv: ["./jest-setup.js"],
   collectCoverageFrom: ["src/**/*.js"],