diff --git a/src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs b/src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs
index b717bd76219..03b9865044f 100644
--- a/src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs
+++ b/src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs
@@ -654,10 +654,10 @@ public void Sort(TKey[] keys, TValue[] values, int index, int length, IComparer<
         private static void SwapIfGreaterWithItems(TKey[] keys, TValue[] values, IComparer<TKey> comparer, int a, int b)
         {
             Debug.Assert(keys != null);
-            Debug.Assert(values != null && values.Length >= keys.Length);
+            Debug.Assert(values != null);
             Debug.Assert(comparer != null);
-            Debug.Assert(0 <= a && a < keys.Length);
-            Debug.Assert(0 <= b && b < keys.Length);
+            Debug.Assert(0 <= a && a < keys.Length && a < values.Length);
+            Debug.Assert(0 <= b && b < keys.Length && b < values.Length);
 
             if (a != b)
             {
diff --git a/tests/TopN.CoreFX.Windows.issues.json b/tests/TopN.CoreFX.Windows.issues.json
index 87b9bd16205..c1511d85bff 100644
--- a/tests/TopN.CoreFX.Windows.issues.json
+++ b/tests/TopN.CoreFX.Windows.issues.json
@@ -775,18 +775,6 @@
             "namespaces": null,
             "classes": null,
             "methods": [
-                {
-                    "name": "System.Tests.TupleTests.CompareTo",
-                    "reason": "https://github.com/dotnet/corert/issues/6015"
-                },
-                {
-                    "name": "System.Tests.TupleTests.Equals_GetHashCode",
-                    "reason": "https://github.com/dotnet/corert/issues/6015"
-                },
-                {
-                    "name": "System.Tests.ArrayTests.Sort_Array_Array_NonGeneric",
-                    "reason": "https://github.com/dotnet/corert/issues/6016"
-                },
                 {
                     "name": "System.Reflection.Tests.MethodInfoTests.TestEquality2",
                     "reason": "Xunit.Sdk.EqualException"