diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 04639c09..c243f0ff 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,22 +5,13 @@ on:
   workflow_dispatch:
 
 jobs:
-  yarn-lockfile-check:
-    uses: salesforcecli/github-workflows/.github/workflows/lockFileCheck.yml@main
-  # Since the Windows unit tests take much longer, we run the linux unit tests first and then run the windows unit tests in parallel with NUTs
-  linux-unit-tests:
-    needs: yarn-lockfile-check
-    uses: salesforcecli/github-workflows/.github/workflows/unitTestsLinux.yml@main
-  windows-unit-tests:
-    needs: linux-unit-tests
-    uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
   nuts:
-    needs: linux-unit-tests
-    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
+    uses: salesforcecli/github-workflows/.github/workflows/nut.yml@sm/fix-retries
     secrets: inherit
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
       fail-fast: false
     with:
       os: ${{ matrix.os }}
+      retries: 2
diff --git a/test/commands/create.nut.ts b/test/commands/create.nut.ts
index 4a252dbe..46582166 100644
--- a/test/commands/create.nut.ts
+++ b/test/commands/create.nut.ts
@@ -47,7 +47,7 @@ describe('creates a user from a file and verifies', () => {
     const usernameResult = output?.result.fields.username as string;
     expect(usernameResult.startsWith(testUsername)).to.be.true;
     // ends with . followed by the prefix for orgId (lowercased!) and 15 more lowercase characters or digits
-    expect(usernameResult).matches(/.*\.00d[a-z|\d]{15}$/);
+    expect(usernameResult).matches(/.*\.__NO__00d[a-z|\d]{15}$/);
   });
 
   it('creates a user with setuniqueusername without username on commandline', () => {