diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
 
   char curopt;
 
-  while(((char)-1) != (curopt = getopt(argc, argv, "u:h")))
+  while(((char)-1) != (curopt = getopt(argc, argv, "u:th")))
      {
        if(curopt == ':')
          {
@@ -77,9 +77,14 @@ int main(int argc, char *argv[])
          }
        else if(curopt == 'h')
          {
-           fprintf(stderr, "Usage: distrenslave [option] \nStarts a distren slave\n\t-u\tset username (run after fresh install)\n\t-h\tshow this help\n");
+           fprintf(stderr, "Usage: distrenslave [option] \nStarts a distren slave\n\t-u\tset username (run after fresh install)\n\t-t\tEnter test mode\n\t-h\tshow this help\n");
            return 2;
          }
+       else if(curopt == 't')
+         {
+           slaveTest();
+           return 0;
+         }
        else if(curopt == 'u')
          username = strdup(optarg);
          fprintf(stderr, "Putting username \"%s\" in distrenslave.conf\n", username);