diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
index 3198c95d0..76ba4ce33 100644
--- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
@@ -171,11 +171,9 @@ final class IvySbt(val configuration: IvyConfiguration, fileToStore: File => Cac
 
         val configs =
           moduleSettings match {
-            case ic: InlineConfiguration             => ic.configurations
-            case ic: InlineConfigurationWithExcludes => ic.configurations
-            case ec: EmptyConfiguration              => Nil
-            case pc: PomConfiguration                => Configurations.default ++ Configurations.defaultInternal
-            case ifc: IvyFileConfiguration           => Configurations.default ++ Configurations.defaultInternal
+            case ic: InlineConfiguration   => ic.configurations
+            case pc: PomConfiguration      => Configurations.default ++ Configurations.defaultInternal
+            case ifc: IvyFileConfiguration => Configurations.default ++ Configurations.defaultInternal
           }
         moduleSettings.ivyScala match {
           case Some(is) =>
diff --git a/librarymanagement/src/test/scala/ScalaOverrideTest.scala b/librarymanagement/src/test/scala/ScalaOverrideTest.scala
index bf0b82e3e..f14a2d6ca 100644
--- a/librarymanagement/src/test/scala/ScalaOverrideTest.scala
+++ b/librarymanagement/src/test/scala/ScalaOverrideTest.scala
@@ -12,10 +12,12 @@ class ScalaOverrideTest extends UnitSpec {
   val OtherOrgID = "other.org"
 
   def check(org0: String, version0: String)(org1: String, name1: String, version1: String) = {
-    val osm = new OverrideScalaMediator(org0, version0)
+    val scalaConfigs = Configurations.default.toVector filter { Configurations.underScalaVersion } map { _.name }
+    val osm = new OverrideScalaMediator(org0, version0, scalaConfigs)
 
     val mrid = ModuleRevisionId.newInstance(org1, name1, version1)
     val dd = new DefaultDependencyDescriptor(mrid, false)
+    dd.addDependencyConfiguration("compile", "compile")
 
     val res = osm.mediate(dd)
     res.getDependencyRevisionId shouldBe ModuleRevisionId.newInstance(org0, name1, version0)