diff --git a/unit_tests/smtp.c b/unit_tests/smtp.c
index ca003bd..456c284 100644
--- a/unit_tests/smtp.c
+++ b/unit_tests/smtp.c
@@ -25,6 +25,7 @@
 
 char *testmessage = "From: aaa@aaa.fu\nTo: bela@aaa.fu\nMessage-Id: ajajajaja\nSubject: this is a test\n\nAaaaaa.";
 
+int helo = 0; // 0=HELO, 1=EHLO
 
 void usage(){
    printf("\nusage: smtp\n\n");
@@ -89,13 +90,26 @@
 }
 
 
+void send_helo_command(struct net *net){
+   char recvbuf[MAXBUFSIZE];
+
+   if(helo == 0){
+      send_smtp_command(net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
+      assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
+   }
+   else {
+      send_smtp_command(net, "EHLO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
+      assert(strncmp(recvbuf, "250-", 4) == 0 && "HELO");
+   }
+}
+
+
 static void test_smtp_commands_one_at_a_time(char *server, int port, struct data *data){
    char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
 
    connect_to_smtp_server(server, port, data);
 
-   send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
-   assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
+   send_helo_command(data->net);
 
    send_smtp_command(data->net, "MAIL FROM: <sender@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1);
    assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
@@ -123,8 +137,7 @@
 
    connect_to_smtp_server(server, port, data);
 
-   send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
-   assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
+   send_helo_command(data->net);
 
    send_smtp_command(data->net, "MAIL FROM: <sender@aaa.fu>\r\nRCPT TO: <archive@aaa.fu>\r\nDATA\r\n", recvbuf, sizeof(recvbuf)-1);
    assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
@@ -143,8 +156,7 @@
 
    connect_to_smtp_server(server, port, data);
 
-   send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
-   assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
+   send_helo_command(data->net);
 
    send_smtp_command(data->net, "MAIL FROM: <sender@aaa.fu>\r\n", recvbuf, sizeof(recvbuf)-1);
    assert(strncmp(recvbuf, "250 ", 4) == 0 && "MAIL");
@@ -167,8 +179,7 @@
 
    connect_to_smtp_server(server, port, data);
 
-   send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
-   assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
+   send_helo_command(data->net);
 
    write1(data->net, "M", 1);
    printf("sent: M\n");
@@ -199,8 +210,7 @@
 
    connect_to_smtp_server(server, port, data);
 
-   send_smtp_command(data->net, "HELO aaaa.fu\r\n", recvbuf, sizeof(recvbuf)-1);
-   assert(strncmp(recvbuf, "250 ", 4) == 0 && "HELO");
+   send_helo_command(data->net);
 
    write1(data->net, "M", 1);
    printf("sent: M\n");
@@ -217,6 +227,13 @@
 }
 
 
+static void test_smtp_commands_starttls(char *server, int port, struct data *data){
+   char recvbuf[MAXBUFSIZE], sendbuf[MAXBUFSIZE];
+
+   // TODO: implement starttls logic
+}
+
+
 int main(int argc, char **argv){
    int c, port=25;
    char *server=NULL;
@@ -235,15 +252,16 @@
             {"server",       required_argument,  0,  's' },
             {"port",         required_argument,  0,  'p' },
             {"timeout",      required_argument,  0,  't' },
+            {"lhlo",         no_argument,        0,  'l' },
             {"help",         no_argument,        0,  'h' },
             {0,0,0,0}
          };
 
       int option_index = 0;
 
-      c = getopt_long(argc, argv, "c:s:p:t:h?", long_options, &option_index);
+      c = getopt_long(argc, argv, "c:s:p:t:lh?", long_options, &option_index);
 #else
-      c = getopt(argc, argv, "c:s:p:t:h?");
+      c = getopt(argc, argv, "c:s:p:t:lh?");
 #endif
 
 
@@ -263,6 +281,10 @@
                     net.timeout = atoi(optarg);
                     break;
 
+         case 'l' :
+                    helo = 1;
+                    break;
+
          case 'h' :
          case '?' :
                     usage();
@@ -283,7 +305,7 @@
    test_smtp_commands_with_reset_command(server, port, &data);
    test_smtp_commands_partial_command(server, port, &data);
    test_smtp_commands_partial_command_pipelining(server, port, &data);
-
+   test_smtp_commands_starttls(server, port, &data);
 
 
    return 0;