diff --git a/test/ndnSIM-tests.cc b/test/ndnSIM-tests.cc
new file mode 100644
index 0000000..004f761
--- /dev/null
+++ b/test/ndnSIM-tests.cc
@@ -0,0 +1,46 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011,2012 University of California, Los Angeles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Ilya Moiseenko <iliamo@cs.ucla.edu>
+ *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+#include "ns3/test.h"
+
+#include "ndnSIM-serialization.h"
+#include "ndnSIM-pit.h"
+
+namespace ns3
+{
+
+class NdnSimTestSuite : public TestSuite
+{
+public:
+  NdnSimTestSuite ()
+    : TestSuite ("ndnSIM-suite", UNIT)
+  {
+    SetDataDir (NS_TEST_SOURCEDIR);
+    
+    AddTestCase (new InterestSerializationTest ());
+    AddTestCase (new ContentObjectSerializationTest ());
+    AddTestCase (new PitTest ());
+  }
+};
+
+static NdnSimTestSuite suite;
+
+}