diff --git a/runconfig/parse_test.go b/runconfig/parse_test.go
index 8ad40b9d2d..88fa0dd542 100644
--- a/runconfig/parse_test.go
+++ b/runconfig/parse_test.go
@@ -22,3 +22,29 @@ func TestParseLxcConfOpt(t *testing.T) {
 		}
 	}
 }
+
+func TestNetHostname(t *testing.T) {
+	if _, _, _, err := Parse([]string{"-h=name", "img", "cmd"}, nil); err != nil {
+		t.Fatal("Unexpected error: %s", err)
+	}
+
+	if _, _, _, err := Parse([]string{"--net=host", "img", "cmd"}, nil); err != nil {
+		t.Fatal("Unexpected error: %s", err)
+	}
+
+	if _, _, _, err := Parse([]string{"-h=name", "--net=bridge", "img", "cmd"}, nil); err != nil {
+		t.Fatal("Unexpected error: %s", err)
+	}
+
+	if _, _, _, err := Parse([]string{"-h=name", "--net=none", "img", "cmd"}, nil); err != nil {
+		t.Fatal("Unexpected error: %s", err)
+	}
+
+	if _, _, _, err := Parse([]string{"-h=name", "--net=host", "img", "cmd"}, nil); err != ErrConflictNetworkHostname {
+		t.Fatal("Expected error ErrConflictNetworkHostname, got: %s", err)
+	}
+
+	if _, _, _, err := Parse([]string{"-h=name", "--net=container:other", "img", "cmd"}, nil); err != ErrConflictNetworkHostname {
+		t.Fatal("Expected error ErrConflictNetworkHostname, got: %s", err)
+	}
+}