diff --git a/test/test-ccnx-wrapper.cc b/test/test-ccnx-wrapper.cc
index 07c87e8..2b99dd3 100644
--- a/test/test-ccnx-wrapper.cc
+++ b/test/test-ccnx-wrapper.cc
@@ -121,8 +121,6 @@
   g_timeout_counter = 0;
 
 
-  c1.reset ();
-  c2.reset ();
 }
 
 void
@@ -149,6 +147,12 @@
   BOOST_CHECK_EQUAL(g_dataCallback_counter, 1);
   BOOST_CHECK_EQUAL(g_timeout_counter, 3);
 }
+
+BOOST_AUTO_TEST_CASE(Cleanup)
+{
+  c1.reset ();
+  c2.reset ();
+}
 // BOOST_AUTO_TEST_CASE (CcnxWrapperSigningTest)
 // {
 //   Bytes data;