diff --git a/src/eidps.c b/src/eidps.c
index c3a00e52d9..f2f0e99cd6 100644
--- a/src/eidps.c
+++ b/src/eidps.c
@@ -247,11 +247,6 @@ int main(int argc, char **argv)
     char *conf_filename = NULL;
     int dump_config = 0;
 
-    /* registering signals we use */
-    SignalHandlerSetup(SIGINT, SignalHandlerSigint);
-    SignalHandlerSetup(SIGTERM, SignalHandlerSigterm);
-    SignalHandlerSetup(SIGHUP, SignalHandlerSighup);
-
     /* Initialize the configuration module. */
     ConfInit();
 
@@ -429,6 +424,11 @@ int main(int argc, char **argv)
     }
 #endif /* UNITTESTS */
 
+    /* registering signals we use */
+    SignalHandlerSetup(SIGINT, SignalHandlerSigint);
+    SignalHandlerSetup(SIGTERM, SignalHandlerSigterm);
+    SignalHandlerSetup(SIGHUP, SignalHandlerSighup);
+
     /* initialize packet queues */
     memset(&packet_q,0,sizeof(packet_q));
     memset(&trans_q, 0,sizeof(trans_q));