diff --git a/testing-projects/jnxplus-smoke/tests/nx-micronaut-gradle.spec.ts b/testing-projects/jnxplus-smoke/tests/nx-gradle/micronaut.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-smoke/tests/nx-micronaut-gradle.spec.ts
rename to testing-projects/jnxplus-smoke/tests/nx-gradle/micronaut.spec.ts
diff --git a/testing-projects/jnxplus-smoke/tests/nx-gradle.spec.ts b/testing-projects/jnxplus-smoke/tests/nx-gradle/nx-gradle.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-smoke/tests/nx-gradle.spec.ts
rename to testing-projects/jnxplus-smoke/tests/nx-gradle/nx-gradle.spec.ts
diff --git a/testing-projects/jnxplus-smoke/tests/nx-quarkus-gradle.spec.ts b/testing-projects/jnxplus-smoke/tests/nx-gradle/quarkus.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-smoke/tests/nx-quarkus-gradle.spec.ts
rename to testing-projects/jnxplus-smoke/tests/nx-gradle/quarkus.spec.ts
diff --git a/testing-projects/jnxplus-smoke/tests/nx-boot-gradle.spec.ts b/testing-projects/jnxplus-smoke/tests/nx-gradle/spring-boot.spec.ts
similarity index 91%
rename from testing-projects/jnxplus-smoke/tests/nx-boot-gradle.spec.ts
rename to testing-projects/jnxplus-smoke/tests/nx-gradle/spring-boot.spec.ts
index a70bcaaee..4d59c06b7 100644
--- a/testing-projects/jnxplus-smoke/tests/nx-boot-gradle.spec.ts
+++ b/testing-projects/jnxplus-smoke/tests/nx-gradle/spring-boot.spec.ts
@@ -42,7 +42,7 @@ describe('@jnxplus/nx-gradle spring-boot smoke', () => {
 
   it('should work', async () => {
     execSync(
-      'npx create-nx-workspace@latest test --preset empty --nxCloud false',
+      'npx create-nx-gradle-workspace@latest test --preset spring-boot',
       {
         cwd: smokeDirectory,
         env: process.env,
@@ -52,13 +52,6 @@ describe('@jnxplus/nx-gradle spring-boot smoke', () => {
 
     execSync('git init', execSyncOptions());
 
-    execSync('npm i --save-dev @jnxplus/nx-gradle', execSyncOptions());
-
-    execSync(
-      'npx nx generate @jnxplus/nx-gradle:init --preset spring-boot',
-      execSyncOptions(),
-    );
-
     execSync(
       `npx nx g @jnxplus/nx-gradle:application ${testApp} --framework spring-boot`,
       execSyncOptions(),
diff --git a/testing-projects/jnxplus-smoke/tests/nx-micronaut-maven.spec.ts b/testing-projects/jnxplus-smoke/tests/nx-maven/micronaut.spec.ts
similarity index 90%
rename from testing-projects/jnxplus-smoke/tests/nx-micronaut-maven.spec.ts
rename to testing-projects/jnxplus-smoke/tests/nx-maven/micronaut.spec.ts
index 1a8a8fcb5..d92fc3d92 100644
--- a/testing-projects/jnxplus-smoke/tests/nx-micronaut-maven.spec.ts
+++ b/testing-projects/jnxplus-smoke/tests/nx-maven/micronaut.spec.ts
@@ -42,7 +42,7 @@ describe('@jnxplus/nx-maven micronaut smoke', () => {
 
   it('should work', async () => {
     execSync(
-      'npx create-nx-workspace@latest test --preset empty --nxCloud false',
+      'npx create-nx-maven-workspace@latest test --dependencyManagement micronaut-parent-pom',
       {
         cwd: smokeDirectory,
         env: process.env,
@@ -52,13 +52,6 @@ describe('@jnxplus/nx-maven micronaut smoke', () => {
 
     execSync('git init', execSyncOptions());
 
-    execSync('npm i --save-dev @jnxplus/nx-maven', execSyncOptions());
-
-    execSync(
-      'npx nx generate @jnxplus/nx-maven:init --dependencyManagement micronaut-parent-pom',
-      execSyncOptions(),
-    );
-
     execSync(
       `npx nx g @jnxplus/nx-maven:application ${testApp} --framework micronaut`,
       execSyncOptions(),
diff --git a/testing-projects/jnxplus-smoke/tests/nx-maven.spec.ts b/testing-projects/jnxplus-smoke/tests/nx-maven/nx-maven.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-smoke/tests/nx-maven.spec.ts
rename to testing-projects/jnxplus-smoke/tests/nx-maven/nx-maven.spec.ts
diff --git a/testing-projects/jnxplus-smoke/tests/nx-quarkus-maven.spec.ts b/testing-projects/jnxplus-smoke/tests/nx-maven/quarkus.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-smoke/tests/nx-quarkus-maven.spec.ts
rename to testing-projects/jnxplus-smoke/tests/nx-maven/quarkus.spec.ts
diff --git a/testing-projects/jnxplus-smoke/tests/nx-boot-maven.spec.ts b/testing-projects/jnxplus-smoke/tests/nx-maven/spring-boot.spec.ts
similarity index 100%
rename from testing-projects/jnxplus-smoke/tests/nx-boot-maven.spec.ts
rename to testing-projects/jnxplus-smoke/tests/nx-maven/spring-boot.spec.ts