diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala
new file mode 100644
index 000000000..5a58c097b
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A1.scala
@@ -0,0 +1,2 @@
+trait A
+object A
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala
new file mode 100644
index 000000000..8a0b629bc
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/A2.scala
@@ -0,0 +1,4 @@
+trait A
+object A {
+  implicit def m[A]: M[A] = ???
+}
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/B.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala
similarity index 100%
rename from sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/B.scala
rename to sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/B.scala
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/C.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala
similarity index 100%
rename from sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/C.scala
rename to sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/C.scala
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala
new file mode 100644
index 000000000..9464f4238
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/changes/M.scala
@@ -0,0 +1,4 @@
+class M[A](a: A)
+object M {
+  implicit def m[A]: M[A] = ???
+}
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/pending b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/pending
similarity index 72%
rename from sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/pending
rename to sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/pending
index e5f50944f..701b2c9a5 100644
--- a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/pending
+++ b/sbt/src/sbt-test/source-dependencies/implicit-search-companion-scope/pending
@@ -1,6 +1,4 @@
 # Tests if dependencies on implicit scope are tracked properly
-# We use higher kinded types in order to make type checker to
-# infer more and thus obscure true dependencies
 $ copy-file changes/A1.scala A.scala
 $ copy-file changes/B.scala B.scala
 $ copy-file changes/M.scala M.scala
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala
deleted file mode 100644
index c56e4578f..000000000
--- a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A1.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-import scala.languageFeature.higherKinds
-trait A
-object A
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala
deleted file mode 100644
index 1b749793d..000000000
--- a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/A2.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import scala.languageFeature.higherKinds
-trait A
-object A {
-  implicit def m[MM[_], A]: MM[A] = ???
-}
diff --git a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala b/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala
deleted file mode 100644
index 9fd664bea..000000000
--- a/sbt/src/sbt-test/source-dependencies/implicit-search-higher-kinded/changes/M.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-import scala.languageFeature.higherKinds
-
-class M[A](a: A)
-object M {
-  implicit def m[MM[_], A]: MM[A] = ???
-}