diff --git a/tests/test_stream.cpp b/tests/test_stream.cpp
new file mode 100644
--- /dev/null
+++ b/tests/test_stream.cpp
@@ -0,0 +1,85 @@
+/*
+  Copyright © 2018 Hasan Yavuz Özderya
+
+  This file is part of serialplot.
+
+  serialplot is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  serialplot is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stream.h"
+
+#include "catch.hpp"
+#include "test_helpers.h"
+
+TEST_CASE("construction of stream with default values", "[memory, stream]")
+{
+    // default values are an empty stream with no channels
+    Stream s;
+
+    REQUIRE(s.numChannels() == 0);
+    REQUIRE(!s.hasX());
+    REQUIRE(s.numSamples() == 0);
+}
+
+TEST_CASE("construction of stream with parameters", "[memory, stream]")
+{
+    Stream s(4, true, 100);
+
+    REQUIRE(s.numChannels() == 4);
+    REQUIRE(s.hasX());
+    REQUIRE(s.numSamples() == 100);
+
+    for (unsigned i = 0; i < 4; i++)
+    {
+        const StreamChannel* c = s.channel(i);
+        REQUIRE(c != NULL);
+        REQUIRE(c->index() == i);
+    }
+}
+
+TEST_CASE("adding data to a stream with no X", "[memory, stream, data]")
+{
+    Stream s(3, false, 10);
+
+    // prepare data
+    SamplePack pack(5, 3, false);
+    for (unsigned ci = 0; ci < 3; ci++)
+    {
+        for (unsigned i = 0; i < 5; i++)
+        {
+            pack.data(ci)[i] = i;
+        }
+    }
+
+    TestSource so(3, false);
+    so.connect(&s);
+
+    // test
+    so._feed(pack);
+
+    for (unsigned ci = 0; ci < 3; ci++)
+    {
+        const StreamChannel* c = s.channel(ci);
+        const FrameBuffer* y = c->yData();
+
+        for (unsigned i = 0; i < 5; i++)
+        {
+            REQUIRE(y->sample(i) == 0);
+        }
+        for (unsigned i = 5; i < 10; i++)
+        {
+            REQUIRE(y->sample(i) == i-5);
+        }
+    }
+}