diff --git a/test/Makefile.am b/test/Makefile.am
index 0baad1bed..b16fd8e7f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,6 +13,7 @@ icinga2_test_SOURCES = \
 	base-dictionary.cpp \
 	base-fifo.cpp \
 	base-match.cpp \
+	base-netstring.cpp \
 	base-object.cpp \
 	base-shellescape.cpp \
 	base-stacktrace.cpp \
diff --git a/test/base-fifo.cpp b/test/base-fifo.cpp
index d7e93a155..9fdd72150 100644
--- a/test/base-fifo.cpp
+++ b/test/base-fifo.cpp
@@ -32,6 +32,8 @@ BOOST_AUTO_TEST_CASE(construct)
 	FIFO::Ptr fifo = boost::make_shared<FIFO>();
 	BOOST_CHECK(fifo);
 	BOOST_CHECK(fifo->GetAvailableBytes() == 0);
+
+	fifo->Close();
 }
 
 BOOST_AUTO_TEST_CASE(io)
@@ -46,10 +48,15 @@ BOOST_AUTO_TEST_CASE(io)
 	BOOST_CHECK(memcmp(buffer1, "he", 2) == 0);
 	BOOST_CHECK(fifo->GetAvailableBytes() == 3);
 
-	char buffer2[3];
-	fifo->Read(buffer2, 3);
+	char buffer2[5];
+	size_t rc = fifo->Read(buffer2, 5);
+	BOOST_CHECK(rc == 3);
 	BOOST_CHECK(memcmp(buffer2, "llo", 3) == 0);
 	BOOST_CHECK(fifo->GetAvailableBytes() == 0);
+
+	BOOST_CHECK(!fifo->IsEof());
+
+	fifo->Close();
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/base-netstring.cpp b/test/base-netstring.cpp
new file mode 100644
index 000000000..fcd177913
--- /dev/null
+++ b/test/base-netstring.cpp
@@ -0,0 +1,42 @@
+/******************************************************************************
+ * Icinga 2                                                                   *
+ * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/)        *
+ *                                                                            *
+ * This program 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 2             *
+ * of the License, or (at your option) any later version.                     *
+ *                                                                            *
+ * This program 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 this program; if not, write to the Free Software Foundation     *
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ ******************************************************************************/
+
+#include "base/netstring.h"
+#include "base/fifo.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+using namespace icinga;
+
+BOOST_AUTO_TEST_SUITE(base_netstring)
+
+BOOST_AUTO_TEST_CASE(netstring)
+{
+	FIFO::Ptr fifo = boost::make_shared<FIFO>();
+
+	NetString::WriteStringToStream(fifo, "hello");
+
+	String s;
+	BOOST_CHECK(NetString::ReadStringFromStream(fifo, &s));
+	BOOST_CHECK(s == "hello");
+
+	fifo->Close();
+}
+
+BOOST_AUTO_TEST_SUITE_END()