diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs b/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs
index ff9dbb5a21590..b3603dcb41181 100644
--- a/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs
+++ b/src/Compilers/CSharp/Test/Emit/Attributes/EmitTestStrongNameProvider.cs
@@ -1,7 +1,5 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-// The use of SigningTestHelpers makes this necessary for now. Fix is tracked by https://github.com/dotnet/roslyn/issues/25228
-#if NET461
using System;
using System.Collections.Immutable;
using System.IO;
@@ -163,4 +161,3 @@ public static void Main(string[] args) { }
}
}
}
-#endif
diff --git a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj
index 64aa8e91f210d..310813fb4085a 100644
--- a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj
+++ b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj
@@ -43,6 +43,7 @@
+
diff --git a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj
index 2e5992acbad11..911552887bdff 100644
--- a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj
+++ b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj
@@ -35,5 +35,6 @@
+
-
\ No newline at end of file
+
diff --git a/src/Test/Utilities/Portable/Platform/Custom/MetadataSignatureHelper.cs b/src/Test/Utilities/Portable/Platform/Custom/MetadataSignatureHelper.cs
index 9f98c99ea9312..9f4bec956af67 100644
--- a/src/Test/Utilities/Portable/Platform/Custom/MetadataSignatureHelper.cs
+++ b/src/Test/Utilities/Portable/Platform/Custom/MetadataSignatureHelper.cs
@@ -1,5 +1,5 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET461 || NET46 || NETCOREAPP2_0
+#if !NETSTANDARD1_3
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -542,14 +542,10 @@ static private void AppendFieldInfo(FieldInfo field, StringBuilder sb)
if (field.IsInitOnly) sb.Append("initonly ");
if (field.IsLiteral) sb.Append("literal ");
-#if NET46 || NET461
if (field.IsNotSerialized) sb.Append("notserialized ");
-#endif
if (field.Attributes.HasFlag(FieldAttributes.SpecialName)) sb.Append("specialname ");
if (field.Attributes.HasFlag(FieldAttributes.RTSpecialName)) sb.Append("rtspecialname ");
-#if NET46 || NET461
if (field.IsPinvokeImpl) sb.Append("pinvokeimpl ");
-#endif
sb.Append(field.IsStatic ? "static " : "instance ");
AppendType(field.FieldType, sb);
diff --git a/src/Test/Utilities/Portable/Platform/Desktop/SigningTestHelpers.cs b/src/Test/Utilities/Portable/Platform/Custom/SigningTestHelpers.cs
similarity index 99%
rename from src/Test/Utilities/Portable/Platform/Desktop/SigningTestHelpers.cs
rename to src/Test/Utilities/Portable/Platform/Custom/SigningTestHelpers.cs
index fc58e2e4af578..27bf23555b6c6 100644
--- a/src/Test/Utilities/Portable/Platform/Desktop/SigningTestHelpers.cs
+++ b/src/Test/Utilities/Portable/Platform/Custom/SigningTestHelpers.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET461 || NET46
+#if !NETSTANDARD1_3
using System;
using System.Collections.Immutable;
using System.IO;
diff --git a/src/Test/Utilities/Portable/TestUtilities.csproj b/src/Test/Utilities/Portable/TestUtilities.csproj
index fbb9740fe48e3..562021df8f4d4 100644
--- a/src/Test/Utilities/Portable/TestUtilities.csproj
+++ b/src/Test/Utilities/Portable/TestUtilities.csproj
@@ -12,6 +12,7 @@
$(DefineConstants);DNX
true
+ false
@@ -95,36 +96,15 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- all
- all
-
-