diff --git a/.gitmodules b/.gitmodules
index 09e096a43aef..fcc2a9370cbb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,5 +8,5 @@
 	branch = dotty-library2.12
 [submodule "collection-strawman"]
 	path = collection-strawman
-	url = https://github.com/scala/collection-strawman.git
-	branch = master
+	url = https://github.com/dotty-staging/collection-strawman.git
+	branch = dotty
diff --git a/collection-strawman b/collection-strawman
index abd20a60f730..58fd6b002889 160000
--- a/collection-strawman
+++ b/collection-strawman
@@ -1 +1 @@
-Subproject commit abd20a60f730ef478551ee68ed4326f8bf582dd8
+Subproject commit 58fd6b002889d071e12223c403cdf8d82b43c298
diff --git a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
index 8c969d6ff011..2e7d8e8c58b9 100644
--- a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
+++ b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
@@ -64,14 +64,12 @@ class IdempotencyTests extends ParallelTesting {
     }
     val allChecks = {
       check("CheckOrderIdempotency") +
-      // Disabled until strawman is fixed
-      // check("CheckStrawmanIdempotency") +
+      check("CheckStrawmanIdempotency") +
       check("CheckPosIdempotency")
     }
 
     val allTests = {
-      // Disabled until strawman is fixed
-      // strawmanIdempotency +
+      strawmanIdempotency +
       orderIdempotency +
       posIdempotency
     }
diff --git a/compiler/test/dotty/tools/dotc/LinkTests.scala b/compiler/test/dotty/tools/dotc/LinkTests.scala
index 29a81aed3593..2702b0e88565 100644
--- a/compiler/test/dotty/tools/dotc/LinkTests.scala
+++ b/compiler/test/dotty/tools/dotc/LinkTests.scala
@@ -25,9 +25,7 @@ class LinkTests extends ParallelTesting {
   def isInteractive = SummaryReport.isInteractive
   def testFilter = Properties.testsFilter
 
-
-  // Disabled until strawman is fixed
-  // @Test
+  @Test
   def linkTest: Unit = {
     // Setup and compile libraries
     val strawmanLibGroup = TestGroup("linkTest/strawmanLibrary")