diff --git a/sbt/src/sbt-test/dependency-management/cache-classifiers/b/build.sbt b/sbt/src/sbt-test/dependency-management/cache-classifiers/b/build.sbt
index 4e94e4922..900bd886f 100644
--- a/sbt/src/sbt-test/dependency-management/cache-classifiers/b/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/cache-classifiers/b/build.sbt
@@ -1,4 +1,4 @@
-libraryDependencies += "org.example" %% "artifacta" % "1.0.0-SNAPSHOT" withSources() classifier("test") classifier("")
+libraryDependencies += "org.example" %% "artifacta" % "1.0.0-SNAPSHOT" withSources() classifier("tests") classifier("")
 
 externalResolvers := Seq( "demo" at ( (baseDirectory in ThisBuild).value / "demo-repo").toURI.toString )
 
diff --git a/sbt/src/sbt-test/dependency-management/cross-conflict/changes/conflict-error.sbt b/sbt/src/sbt-test/dependency-management/cross-conflict/changes/conflict-error.sbt
deleted file mode 100644
index 189407454..000000000
--- a/sbt/src/sbt-test/dependency-management/cross-conflict/changes/conflict-error.sbt
+++ /dev/null
@@ -1 +0,0 @@
-conflictWarning ~= { _.copy(failOnConflict = true) }
diff --git a/sbt/src/sbt-test/dependency-management/cross-conflict/changes/no-conflict-error.sbt b/sbt/src/sbt-test/dependency-management/cross-conflict/changes/no-conflict-error.sbt
new file mode 100644
index 000000000..8ebdf0f5e
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/cross-conflict/changes/no-conflict-error.sbt
@@ -0,0 +1 @@
+conflictWarning ~= { _.copy(failOnConflict = false) }
diff --git a/sbt/src/sbt-test/dependency-management/cross-conflict/test b/sbt/src/sbt-test/dependency-management/cross-conflict/test
index 6b7a1b69a..23768a9a5 100644
--- a/sbt/src/sbt-test/dependency-management/cross-conflict/test
+++ b/sbt/src/sbt-test/dependency-management/cross-conflict/test
@@ -1,5 +1,5 @@
-> update
-$ copy-file changes/conflict-error.sbt conflict-error.sbt
+-> update
+$ copy-file changes/no-conflict-error.sbt no-conflict-error.sbt
 
 > reload
--> update
+> update
diff --git a/sbt/src/sbt-test/dependency-management/exclude-scala/test b/sbt/src/sbt-test/dependency-management/exclude-scala/test
index 4094ddd36..3c9d4b6d0 100644
--- a/sbt/src/sbt-test/dependency-management/exclude-scala/test
+++ b/sbt/src/sbt-test/dependency-management/exclude-scala/test
@@ -6,7 +6,11 @@ $ touch stm
 
 $ touch noscala
 > reload
-> scalaOverride
+# before 0.13, the Scala version was overridden for dependency management,
+#  but now it is only introduced by a dependency on Scala
+#  when autoScalaLibrary is false, therefore, the resolved Scala version
+#  is determined by the dependency manager
+-> scalaOverride
 
 $ delete stm
 > reload
diff --git a/src/sphinx/Community/ChangeSummary_0.13.0.rst b/src/sphinx/Community/ChangeSummary_0.13.0.rst
index 5a50e75e1..20e8d9334 100644
--- a/src/sphinx/Community/ChangeSummary_0.13.0.rst
+++ b/src/sphinx/Community/ChangeSummary_0.13.0.rst
@@ -14,6 +14,7 @@ Features, fixes, changes with compatibility implications (incomplete, please hel
 - Dropped support for tab completing the right side of a setting for the ``set`` command.  The new task macros make this tab completion obsolete.
 - The convention for keys is now camelCase only.  Details below.
 - sbt no longer looks for main artifacts for poms with ``packaging="pom"``.  For details, see the :ref:`relevant Library Management section <packaging-pom>` and gh-636.
+- Fixed the default classifier for tests to be ``tests`` for proper Maven compatibility.
 
 Features
 --------