diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1365445ea..ba789e645 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -172,8 +172,8 @@ jobs:
         if: ${{ matrix.jobtype == 5 }}
         shell: bash
         run: |
+          ./sbt -v "scripted global-plugin/*"
           ./sbt -v "scripted project/*"
-          ./sbt -v "scripted project1/*"
       # - name: Build and test (6)
       #  if: ${{ matrix.jobtype == 6 }}
       #  shell: bash
diff --git a/sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt b/sbt-app/src/sbt-test/global-plugin/global-plugin/build.sbt
similarity index 59%
rename from sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt
rename to sbt-app/src/sbt-test/global-plugin/global-plugin/build.sbt
index d0cefbe75..a46588377 100644
--- a/sbt-app/src/sbt-test/project1/global-plugin/changes/build.sbt
+++ b/sbt-app/src/sbt-test/global-plugin/global-plugin/build.sbt
@@ -1,14 +1,15 @@
+@transient
 lazy val check = taskKey[Unit]("Verifies that the junit dependency has the newer version (4.8)")
 
 lazy val proj = (project in file("."))
   .settings(
-    name := "my-test-proj",
+    name := "test-proj",
     organization := "com.example",
-    check := (update map checkVersion).value,
+    check := update.map(checkVersion).value,
     version := "0.1.0-SNAPSHOT"
   )
 
 def checkVersion(report: UpdateReport): Unit = {
   for mod <- report.allModules do
-    if(mod.name == "junit") assert(mod.revision == "4.8", s"JUnit version (${mod.revision}) does not have the correct version")
+    if mod.name == "junit" then assert(mod.revision == "4.8", s"JUnit version (${mod.revision}) does not have the correct version")
 }
diff --git a/sbt-app/src/sbt-test/project1/global-plugin/changes/global-plugins.sbt b/sbt-app/src/sbt-test/global-plugin/global-plugin/changes/global-plugins.sbt
similarity index 77%
rename from sbt-app/src/sbt-test/project1/global-plugin/changes/global-plugins.sbt
rename to sbt-app/src/sbt-test/global-plugin/global-plugin/changes/global-plugins.sbt
index 2214d0397..976a2d192 100644
--- a/sbt-app/src/sbt-test/project1/global-plugin/changes/global-plugins.sbt
+++ b/sbt-app/src/sbt-test/global-plugin/global-plugin/changes/global-plugins.sbt
@@ -1,3 +1,5 @@
 // use a small java library instead of a plugin to avoid incompatibilities when upgrading
 // This version should be overridden by the one in the project.
 libraryDependencies += "junit" % "junit" % "4.5"
+
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
diff --git a/sbt-app/src/sbt-test/project1/global-plugin/changes/plugins.sbt b/sbt-app/src/sbt-test/global-plugin/global-plugin/changes/plugins.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project1/global-plugin/changes/plugins.sbt
rename to sbt-app/src/sbt-test/global-plugin/global-plugin/changes/plugins.sbt
diff --git a/sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala b/sbt-app/src/sbt-test/global-plugin/global-plugin/global/plugins/A.scala
similarity index 56%
rename from sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala
rename to sbt-app/src/sbt-test/global-plugin/global-plugin/global/plugins/A.scala
index e4eb5889f..f7f85459f 100644
--- a/sbt-app/src/sbt-test/project1/global-plugin/global/plugins/A.scala
+++ b/sbt-app/src/sbt-test/global-plugin/global-plugin/global/plugins/A.scala
@@ -1,15 +1,10 @@
-package test
+package example
 
 import sbt.*, Keys.*
 
-object Global {
+object G:
   val x = 3
-}
 
-object GlobalAutoPlugin extends AutoPlugin {
-
-  object autoImport {
+object GlobalAutoPlugin extends AutoPlugin:
+  object autoImport:
     lazy val globalAutoPluginSetting = settingKey[String]("A top level setting declared in a plugin.")
-  }
-
-}
diff --git a/sbt-app/src/sbt-test/project1/global-plugin/global/useGlobalAutoPlugin.sbt b/sbt-app/src/sbt-test/global-plugin/global-plugin/global/useGlobalAutoPlugin.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/project1/global-plugin/global/useGlobalAutoPlugin.sbt
rename to sbt-app/src/sbt-test/global-plugin/global-plugin/global/useGlobalAutoPlugin.sbt
diff --git a/sbt-app/src/sbt-test/project1/global-plugin/pending b/sbt-app/src/sbt-test/global-plugin/global-plugin/pending
similarity index 90%
rename from sbt-app/src/sbt-test/project1/global-plugin/pending
rename to sbt-app/src/sbt-test/global-plugin/global-plugin/pending
index cda5fc4b3..ae785f180 100644
--- a/sbt-app/src/sbt-test/project1/global-plugin/pending
+++ b/sbt-app/src/sbt-test/global-plugin/global-plugin/pending
@@ -1,6 +1,3 @@
-$ copy-file changes/build.sbt build.sbt
-> reload
-
 # ensure that a new global dependency gets picked up
 $ copy-file changes/global-plugins.sbt global/plugins/plugins.sbt
 > reload
diff --git a/sbt-app/src/sbt-test/global-plugin/global-plugin/project/Test.scala b/sbt-app/src/sbt-test/global-plugin/global-plugin/project/Test.scala
new file mode 100644
index 000000000..3bb758248
--- /dev/null
+++ b/sbt-app/src/sbt-test/global-plugin/global-plugin/project/Test.scala
@@ -0,0 +1,6 @@
+import sbt.*
+
+object Test
+
+// object Test:
+//   assert(example.G.x == 3)
diff --git a/sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala b/sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala
deleted file mode 100644
index 05af06b3a..000000000
--- a/sbt-app/src/sbt-test/project1/global-plugin/project/Test.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import sbt.*
-
-object Test {
-  assert(test.Global.x == 3);
-}