diff --git a/contrib/kyua/utils/fs/directory.cpp b/contrib/kyua/utils/fs/directory.cpp
--- a/contrib/kyua/utils/fs/directory.cpp
+++ b/contrib/kyua/utils/fs/directory.cpp
@@ -204,7 +204,7 @@
                                    original_errno);
         }
         if (result == NULL) {
-            _entry.reset(NULL);
+            _entry.reset();
             close();
         } else {
             _entry.reset(new directory_entry(_dirent.d_name));
diff --git a/contrib/kyua/utils/logging/operations.cpp b/contrib/kyua/utils/logging/operations.cpp
--- a/contrib/kyua/utils/logging/operations.cpp
+++ b/contrib/kyua/utils/logging/operations.cpp
@@ -245,7 +245,7 @@
     if (globals->logfile.get() != NULL) {
         INV(globals->backlog.empty());
         globals->logfile->flush();
-        globals->logfile.reset(NULL);
+        globals->logfile.reset();
     }
 }
 
diff --git a/contrib/kyua/utils/process/child.cpp b/contrib/kyua/utils/process/child.cpp
--- a/contrib/kyua/utils/process/child.cpp
+++ b/contrib/kyua/utils/process/child.cpp
@@ -206,12 +206,12 @@
         new signals::interrupts_inhibiter);
     pid_t pid = detail::syscall_fork();
     if (pid == -1) {
-        inhibiter.reset(NULL);  // Unblock signals.
+        inhibiter.reset();  // Unblock signals.
         ::close(fds[0]);
         ::close(fds[1]);
         throw process::system_error("fork(2) failed", errno);
     } else if (pid == 0) {
-        inhibiter.reset(NULL);  // Unblock signals.
+        inhibiter.reset();  // Unblock signals.
         ::setsid();
 
         try {
@@ -263,10 +263,10 @@
         new signals::interrupts_inhibiter);
     pid_t pid = detail::syscall_fork();
     if (pid == -1) {
-        inhibiter.reset(NULL);  // Unblock signals.
+        inhibiter.reset();  // Unblock signals.
         throw process::system_error("fork(2) failed", errno);
     } else if (pid == 0) {
-        inhibiter.reset(NULL);  // Unblock signals.
+        inhibiter.reset();  // Unblock signals.
         ::setsid();
 
         try {
@@ -289,7 +289,7 @@
         LD(F("Spawned process %s: stdout=%s, stderr=%s") % pid % stdout_file %
            stderr_file);
         signals::add_pid_to_kill(pid);
-        inhibiter.reset(NULL);  // Unblock signals.
+        inhibiter.reset();  // Unblock signals.
         return std::unique_ptr< process::child >(
             new process::child(new impl(pid, NULL)));
     }
diff --git a/contrib/kyua/utils/process/executor.cpp b/contrib/kyua/utils/process/executor.cpp
--- a/contrib/kyua/utils/process/executor.cpp
+++ b/contrib/kyua/utils/process/executor.cpp
@@ -633,10 +633,10 @@
                 "this could be an internal error or a buggy test") %
                 root_work_directory->directory() % e.what());
         }
-        root_work_directory.reset(NULL);
+        root_work_directory.reset();
 
         interrupts_handler->unprogram();
-        interrupts_handler.reset(NULL);
+        interrupts_handler.reset();
     }
 
     /// Common code to run after any of the wait calls.
diff --git a/contrib/kyua/utils/signals/interrupts.cpp b/contrib/kyua/utils/signals/interrupts.cpp
--- a/contrib/kyua/utils/signals/interrupts.cpp
+++ b/contrib/kyua/utils/signals/interrupts.cpp
@@ -145,9 +145,9 @@
 static void
 cleanup_handlers(void)
 {
-    sighup_handler->unprogram(); sighup_handler.reset(NULL);
-    sigint_handler->unprogram(); sigint_handler.reset(NULL);
-    sigterm_handler->unprogram(); sigterm_handler.reset(NULL);
+    sighup_handler->unprogram(); sighup_handler.reset();
+    sigint_handler->unprogram(); sigint_handler.reset();
+    sigterm_handler->unprogram(); sigterm_handler.reset();
 }
 
 
diff --git a/contrib/kyua/utils/signals/timer.cpp b/contrib/kyua/utils/signals/timer.cpp
--- a/contrib/kyua/utils/signals/timer.cpp
+++ b/contrib/kyua/utils/signals/timer.cpp
@@ -257,7 +257,7 @@
             _timer_activation = timer->when();
             add_to_all_timers(timer);
         } catch (...) {
-            _sigalrm_programmer.reset(NULL);
+            _sigalrm_programmer.reset();
             throw;
         }
     }
@@ -276,7 +276,7 @@
         }
 
         _sigalrm_programmer->unprogram();
-        _sigalrm_programmer.reset(NULL);
+        _sigalrm_programmer.reset();
     }
 
     /// Programs a new timer, possibly adjusting the global system timer.
@@ -530,7 +530,7 @@
     }
 
     if (!globals->unprogram(this)) {
-        globals.reset(NULL);
+        globals.reset();
     }
     _pimpl->programmed = false;