diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
index fbd5df9afdde75..77496e80d24c7c 100644
--- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
@@ -467,13 +467,10 @@ private static bool GetTls13Support()
private static bool GetIsRunningOnMonoInterpreter()
{
#if NETCOREAPP
- if (IsBrowser)
- return RuntimeFeature.IsDynamicCodeSupported;
+ return IsMonoRuntime && RuntimeFeature.IsDynamicCodeSupported && !RuntimeFeature.IsDynamicCodeCompiled;
+#else
+ return false;
#endif
- // This is a temporary solution because mono does not support interpreter detection
- // within the runtime.
- var val = Environment.GetEnvironmentVariable("MONO_ENV_OPTIONS");
- return (val != null && val.Contains("--interpreter"));
}
private static bool GetIsBrowserDomSupported()
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 3288e59a9e1b5f..c4f5c48734ebf5 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -170,7 +170,6 @@
-