diff --git a/main/src/test/scala/PluginCommandTest.scala b/main/src/test/scala/PluginCommandTest.scala
index 53fa82c3b..5d8f0b4db 100644
--- a/main/src/test/scala/PluginCommandTest.scala
+++ b/main/src/test/scala/PluginCommandTest.scala
@@ -4,7 +4,7 @@ import java.io._
 
 import org.specs2.mutable.Specification
 
-import sbt.internal.{ Load, BuildDef }
+import sbt.internal.{ Load, BuildDef, OldPlugin }
 import sbt.internal.util.{ AttributeEntry, AttributeMap, ConsoleOut, GlobalLogging, MainLogging, Settings }
 
 object PluginCommandTestPlugin0 extends AutoPlugin
@@ -83,7 +83,7 @@ object FakeState {
     )
 
     val pluginData = PluginData(Nil, Nil, None, None, Nil)
-    val detectedModules: DetectedModules[Plugin] = new DetectedModules(Nil)
+    val detectedModules: DetectedModules[OldPlugin] = new DetectedModules(Nil)
     val builds: DetectedModules[BuildDef] = new DetectedModules[BuildDef](Nil)
 
     val detectedAutoPlugins: Seq[DetectedAutoPlugin] = plugins.map(p => DetectedAutoPlugin(p.label, p, hasAutoImport = false))
diff --git a/sbt/src/sbt-test/project/scripted-plugin/build.sbt b/sbt/src/sbt-test/project/scripted-plugin/build.sbt
deleted file mode 100644
index 1d931d8ac..000000000
--- a/sbt/src/sbt-test/project/scripted-plugin/build.sbt
+++ /dev/null
@@ -1 +0,0 @@
-ScriptedPlugin.scriptedSettings
diff --git a/sbt/src/sbt-test/project/settings/test b/sbt/src/sbt-test/project/settings/test
index 00562c54e..aa1b59357 100644
--- a/sbt/src/sbt-test/project/settings/test
+++ b/sbt/src/sbt-test/project/settings/test
@@ -15,6 +15,7 @@ $ copy-file changes/local.sbt local.sbt
 > check 7
 
 # square
+# plugins, global.sbt, and then local.sbt = (100 * 100) / 25 + 3
 $ copy-file changes/Global.scala global/plugins/Global.scala
 > reload
-> check 19
+> check 403
diff --git a/scripted/plugin/src/main/resources/sbt/sbt.plugins b/scripted/plugin/src/main/resources/sbt/sbt.autoplugins
similarity index 100%
rename from scripted/plugin/src/main/resources/sbt/sbt.plugins
rename to scripted/plugin/src/main/resources/sbt/sbt.autoplugins