diff --git a/test/test_app_socket.cc b/test/test_app_socket.cc
index 985dac3..3e4394e 100644
--- a/test/test_app_socket.cc
+++ b/test/test_app_socket.cc
@@ -103,7 +103,7 @@
   s1.publish (p1, 0, data1, 10);
   _LOG_DEBUG ("s1 publish");
   s1.publish (p1, 0, data2, 10);
-  this_thread::sleep (posix_time::milliseconds (250));
+  this_thread::sleep (posix_time::milliseconds (1000));
   
   // from code logic, we won't be fetching our own data
   a1.set(p1 + "/0/1", data1);
@@ -122,7 +122,7 @@
   // another single source, multiple data at once
   s2.publish(p2, 0, data4, 10); 
   s2.publish(p2, 0, data5, 10);
-  this_thread::sleep (posix_time::milliseconds (200));
+  this_thread::sleep (posix_time::milliseconds (1000));
 
   // from code logic, we won't be fetching our own data
   a3.set(p3 + "/0/0", data3);
diff --git a/wscript b/wscript
index ce56610..c4ece42 100644
--- a/wscript
+++ b/wscript
@@ -4,7 +4,7 @@
 APPNAME='sync'
 
 def options(opt):
-    opt.add_option('--no-debug',action='store_true',default=False,dest='no_debug',help='''Make an optimized build of the library (remove debugging code)''')
+    opt.add_option('--debug',action='store_true',default=False,dest='debug',help='''debugging mode''')
     opt.add_option('--log4cxx', action='store_true',default=False,dest='log4cxx',help='''Compile with log4cxx/native NS3 logging support''')
     opt.add_option('--ns3',     action='store_true',default=False,dest='ns3_enable',help='''Compile as NS-3 module''')
     opt.add_option('--ns3-debug', action='store_true',default=False,dest='ns3_debug',help='''Link against debug NS3 libraries. Optimized version will be used otherwise''')
@@ -47,7 +47,7 @@
         if conf.options.log4cxx:
             conf.check_cfg(package='liblog4cxx', args=['--cflags', '--libs'], uselib_store='LOG4CXX', mandatory=True)
 
-    if not conf.options.no_debug:
+    if conf.options.debug:
         conf.define ('_DEBUG', 1)
         conf.env.append_value('CXXFLAGS', ['-O0', '-g3'])
     else: