diff --git a/test/ndnSIM-tests.cc b/test/ndnSIM-tests.cc
index 0c4ad7e..7242d98 100644
--- a/test/ndnSIM-tests.cc
+++ b/test/ndnSIM-tests.cc
@@ -25,6 +25,7 @@
 #include "ndnSIM-pit.h"
 #include "ndnSIM-stats-tree.h"
 #include "fw-per-fib-limits.h"
+#include "generic-tests.h"
 
 namespace ns3
 {
@@ -37,11 +38,13 @@
   {
     SetDataDir (NS_TEST_SOURCEDIR);
     
-    AddTestCase (new InterestSerializationTest ());
-    AddTestCase (new ContentObjectSerializationTest ());
-    AddTestCase (new PitTest ());
-    AddTestCase (new StatsTreeTest ());
-    AddTestCase (new ndn::FwPerFibLimits ());
+    // AddTestCase (new InterestSerializationTest ());
+    // AddTestCase (new ContentObjectSerializationTest ());
+    // AddTestCase (new PitTest ());
+    // AddTestCase (new StatsTreeTest ());
+
+    // AddTestCase (new ndn::FwPerFibLimits ());
+    AddTestCase (new ndn::GenericTests ());
   }
 };