@@ -122,7 +122,12 @@ public static int RunSimpleString(string code)
 
         public static void Initialize()
         {
-            Initialize(Enumerable.Empty<string>());
+            Initialize(setSysArgv: true);
+        }
+
+        public static void Initialize(bool setSysArgv = true)
+        {
+            Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv);
         }
 
         /// <summary>
@@ -134,7 +139,7 @@ public static void Initialize()
         /// first call. It is *not* necessary to hold the Python global
         /// interpreter lock (GIL) to call this method.
         /// </remarks>
-        public static void Initialize(IEnumerable<string> args)
+        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true)
         {
             if (!initialized)
             {
@@ -148,7 +153,8 @@ public static void Initialize(IEnumerable<string> args)
                 initialized = true;
                 Exceptions.Clear();
 
-                Py.SetArgv(args);
+                if (setSysArgv)
+                    Py.SetArgv(args);
 
                 // register the atexit callback (this doesn't use Py_AtExit as the C atexit
                 // callbacks are called after python is fully finalized but the python ones
@@ -213,7 +219,7 @@ public static void InitExt()
         {
             try
             {
-                Initialize();
+                Initialize(setSysArgv: false);
 
                 // Trickery - when the import hook is installed into an already
                 // running Python, the standard import machinery is still in
 
@@ -4,12 +4,9 @@
 
 import sys
 
-import pytest
-
 from ._compat import check_output
 
 
-@pytest.mark.xfail(reason="argv being reset on import clr. See gh#404")
 def test_sys_argv_state(filepath):
     """Test sys.argv state doesn't change after clr import.
     To better control the arguments being passed, test on a fresh python
Original file line number	Diff line number	Diff line change
@@ -122,7 +122,12 @@ public static int RunSimpleString(string code)
122	122
123	123	public static void Initialize()
124	124	{
125		- Initialize(Enumerable.Empty<string>());
	125	+ Initialize(setSysArgv: true);
	126	+ }
	127	+
	128	+ public static void Initialize(bool setSysArgv = true)
	129	+ {
	130	+ Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv);
126	131	}
127	132
128	133	/// <summary>
@@ -134,7 +139,7 @@ public static void Initialize()
134	139	/// first call. It is not necessary to hold the Python global
135	140	/// interpreter lock (GIL) to call this method.
136	141	/// </remarks>
137		- public static void Initialize(IEnumerable<string> args)
	142	+ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true)
138	143	{
139	144	if (!initialized)
140	145	{
@@ -148,7 +153,8 @@ public static void Initialize(IEnumerable<string> args)
148	153	initialized = true;
149	154	Exceptions.Clear();
150	155
151		- Py.SetArgv(args);
	156	+ if (setSysArgv)
	157	+ Py.SetArgv(args);
152	158
153	159	// register the atexit callback (this doesn't use Py_AtExit as the C atexit
154	160	// callbacks are called after python is fully finalized but the python ones
@@ -213,7 +219,7 @@ public static void InitExt()
213	219	{
214	220	try
215	221	{
216		- Initialize();
	222	+ Initialize(setSysArgv: false);
217	223
218	224	// Trickery - when the import hook is installed into an already
219	225	// running Python, the standard import machinery is still in