diff --git a/tests/tests/swfs/avm2/netstream_client/Test.as b/tests/tests/swfs/avm2/netstream_client/Test.as
new file mode 100644
index 000000000..57de2f9b9
--- /dev/null
+++ b/tests/tests/swfs/avm2/netstream_client/Test.as
@@ -0,0 +1,56 @@
+package {
+    import flash.display.MovieClip;
+    import flash.net.NetConnection;
+    import flash.net.NetStream;
+    import flash.utils.getQualifiedClassName;
+
+    public class Test extends MovieClip {
+
+        public function Test() {
+            super();
+            var con:NetConnection = new NetConnection();
+            con.connect(null);
+            var stream:NetStream = new NetStream(con);
+            trace(stream.client);
+            trace(stream.client == stream);
+            try {
+                stream.client = 3;
+            } catch (e:Error) {
+                trace(getQualifiedClassName(e) + ": " + e.errorID);
+            }
+            try {
+                stream.client = true;
+            } catch (e:Error) {
+                trace(getQualifiedClassName(e) + ": " + e.errorID);
+            }
+            try {
+                stream.client = "abcd";
+            } catch (e:Error) {
+                trace(getQualifiedClassName(e) + ": " + e.errorID);
+            }
+            try {
+                stream.client = null;
+            } catch (e:Error) {
+                trace(getQualifiedClassName(e) + ": " + e.errorID);
+            }
+            try {
+                stream.client = undefined;
+            } catch (e:Error) {
+                trace(getQualifiedClassName(e) + ": " + e.errorID);
+            }
+            try {
+                stream.client = {};
+                trace("success!");
+            } catch (e:Error) {
+                trace(getQualifiedClassName(e) + ": " + e.errorID);
+            }
+            try {
+                stream.client = MovieClip;
+                trace("success!");
+            } catch (e:Error) {
+                trace(getQualifiedClassName(e) + ": " + e.errorID);
+            }
+            trace("test over");
+        }
+    }
+}
diff --git a/tests/tests/swfs/avm2/netstream_client/output.txt b/tests/tests/swfs/avm2/netstream_client/output.txt
new file mode 100644
index 000000000..52b0f1ab9
--- /dev/null
+++ b/tests/tests/swfs/avm2/netstream_client/output.txt
@@ -0,0 +1,10 @@
+[object NetStream]
+true
+TypeError: 2004
+TypeError: 2004
+TypeError: 2004
+TypeError: 2004
+TypeError: 2004
+success!
+success!
+test over
diff --git a/tests/tests/swfs/avm2/netstream_client/test.swf b/tests/tests/swfs/avm2/netstream_client/test.swf
new file mode 100644
index 000000000..e4b483e8a
Binary files /dev/null and b/tests/tests/swfs/avm2/netstream_client/test.swf differ
diff --git a/tests/tests/swfs/avm2/netstream_client/test.toml b/tests/tests/swfs/avm2/netstream_client/test.toml
new file mode 100644
index 000000000..dbee897f5
--- /dev/null
+++ b/tests/tests/swfs/avm2/netstream_client/test.toml
@@ -0,0 +1 @@
+num_frames = 1