diff --git a/test_ndnpeekpoke/test_ndnpeekpoke.py b/test_ndnpeekpoke/test_ndnpeekpoke.py
index 257cfbc..8e38c78 100644
--- a/test_ndnpeekpoke/test_ndnpeekpoke.py
+++ b/test_ndnpeekpoke/test_ndnpeekpoke.py
@@ -17,11 +17,13 @@
     def setUp(self):
         print "\nTesting ndn-tlv-peek & ndn-tlv-poke"
         print "***********************************"
+        os.system("mkdir test_ndnpeekpoke/logs/")
 
     def tearDown(self):
         self.killNfd()
         self.killProcess("ndn-tlv-poke")
         self.killProcess("ndn-tlv-peek")
+        os.system("rm -r test_ndnpeekpoke/logs/")
         self.cleanupProcesses()
 
     def test_peekpoke(self):
@@ -33,7 +35,7 @@
             "-> Starting Poke",
             inputFile=pokeInputFile)
         time.sleep(1)
-        peekOutputFile = os.path.abspath("/tmp/test-peek-output.txt")
+        peekOutputFile = os.path.abspath("test_ndnpeekpoke/logs/test-peek-output.txt")
         self.startProcess("ndn-tlv-peek",
             ["ndn-tlv-peek", "ndn:/test/peekpoke"],
             "-> Starting Peek",