diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 18f8bfc9c..ed3592d8d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,6 +32,36 @@ jobs:
       - run: yarn build
       - name: Run tests
         run: yarn test --maxWorkers=2
+  class-name-updater-tests:
+    runs-on: ubuntu-latest
+    env:
+      GH_PR_NUM: ${{ github.event.number }}
+    steps:
+      - uses: actions/checkout@v2
+      # Yes, we really want to checkout the PR
+      - run: |
+          if [[ ! -z "${GH_PR_NUM}" ]]; then 
+            echo "Checking out PR"
+            git fetch origin pull/$GH_PR_NUM/head:tmp
+            git checkout tmp
+          fi
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+      - uses: actions/cache@v2
+        id: yarn-cache
+        name: Cache npm deps
+        with:
+          path: |
+            node_modules
+            **/node_modules
+            ~/.cache/Cypress
+          key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
+      - run: yarn install --frozen-lockfile
+        if: steps.yarn-cache.outputs.cache-hit != 'true'
+      - run: yarn build:classnames
+      - name: Run class-name-updater tests
+        run: yarn test:classnames
   error-tests:
     runs-on: ubuntu-latest
     env:
diff --git a/package.json b/package.json
index abc194a9b..252354455 100644
--- a/package.json
+++ b/package.json
@@ -16,12 +16,13 @@
     "test:console": "pf-codemods --v6 --no-cache test/console/frontend",
     "test:integreatly": "pf-codemods --v6 --no-cache test/tutorial-web-app",
     "test:packages": "yarn get:packages && node --unhandled-rejections=strict packages/pf-codemods/index.js --v6 --no-cache test/packages",
-    "test:classnames": "class-name-updater --no-cache test",
+    "test:classnames": "yarn build:classnames && lerna run test --scope=@patternfly/class-name-updater --stream",
     "get:packages": "node getPackages.js",
     "generate": "yarn build:generators && plop",
     "build": "lerna run build",
     "build:generators": "tsc --build --verbose generators/tsconfig.cjs.json",
     "build:readme": "lerna run build:readme",
+    "build:classnames": "lerna run build --scope=@patternfly/class-name-updater",
     "clean": "lerna run clean"
   },
   "repository": {
diff --git a/packages/class-name-updater/package.json b/packages/class-name-updater/package.json
index 8feb2d56a..470a5be3d 100644
--- a/packages/class-name-updater/package.json
+++ b/packages/class-name-updater/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "build": "tsc --build --verbose ./tsconfig.json",
     "clean": "rimraf ./dist",
-    "test": "jest"
+    "test": "node ./dist/cli.js test --exclude test/largeFile.js"
   },
   "dependencies": {
     "colors": "^1.4.0",
diff --git a/packages/class-name-updater/src/cli.ts b/packages/class-name-updater/src/cli.ts
index ea801e4b4..8e4e467ed 100755
--- a/packages/class-name-updater/src/cli.ts
+++ b/packages/class-name-updater/src/cli.ts
@@ -8,12 +8,7 @@ import { classNameUpdate } from "./classNameUpdate";
 
 program
   .version(
-    require(join(
-      process.cwd(),
-      "packages",
-      "class-name-updater",
-      "package.json"
-    )).version
+    require('../package.json').version
   )
   .description("Update class name versioning")
   .arguments("<path> [otherPaths...]")
diff --git a/test/largeFile.js b/packages/class-name-updater/test/largeFile.js
similarity index 100%
rename from test/largeFile.js
rename to packages/class-name-updater/test/largeFile.js
diff --git a/test/test.css b/packages/class-name-updater/test/test.css
similarity index 100%
rename from test/test.css
rename to packages/class-name-updater/test/test.css