@@ -1,9 +1,7 @@
 using System;
-using System.Reflection;
-using System.Collections.Generic;
+using System.IO;
 using NUnit.Framework;
 using Python.Runtime;
-using System.IO;
 
 namespace Python.EmbeddingTest
 {
@@ -55,5 +53,15 @@ public void TestDottedName()
             PyObject module = PythonEngine.ImportModule("PyImportTest.test.one");
             Assert.IsNotNull(module, ">>>  import PyImportTest.test.one  # FAILED");
         }
+
+        /// <summary>
+        /// Tests that sys.args is set. If it wasn't exception would be raised.
+        /// </summary>
+        [Test]
+        public void TestSysArgsImportException()
+        {
+            PyObject module = PythonEngine.ImportModule("PyImportTest.sysargv");
+            Assert.IsNotNull(module, ">>>  import PyImportTest.sysargv  # FAILED");
+        }
     }
 }
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+import sys
+# if argv is available, as expected, then no exception
+num_args = len(sys.argv)
@@ -23,6 +23,9 @@
     clr.AddReference("System.Management")
 
 test_modules = (
+    # has to be first test before other module import clr
+	'test_sysargv',
+	
     # test_module passes on its own, but not here if
     # other test modules that import System.Windows.Forms
     # run first. They must not do module level import/AddReference()
 
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+import sys
+
+class SysArgvTests(unittest.TestCase):
+    """Test sys.argv state."""
+
+    def test_sys_argv_state(self):
+        """Test sys.argv state doesn't change after clr import."""
+        argv = sys.argv
+        import clr
+        self.assertTrue(argv == sys.argv)
+
+
+def test_suite():
+    return unittest.makeSuite(SysArgvTests)
@@ -29,12 +29,14 @@
   <ItemGroup>
     <Compile Include="leaktest.py" />
     <Compile Include="profile.py" />
+    <Compile Include="PyImportTest\sysargv.py" />
     <Compile Include="PyImportTest\test\one.py" />
     <Compile Include="PyImportTest\test\__init__.py" />
     <Compile Include="PyImportTest\__init__.py" />
     <Compile Include="runtests.py" />
     <Compile Include="stress.py" />
     <Compile Include="stresstest.py" />
+    <Compile Include="test_sysargv.py" />
     <Compile Include="test_array.py" />
     <Compile Include="test_class.py" />
     <Compile Include="test_compat.py" />