diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index f6805d73..85371f20 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -114,7 +114,7 @@ START_TEST(test_m_delfriend)
                                             REALLY_BIG_NUMBER);
 }
 END_TEST
-
+/*
 START_TEST(test_m_addfriend)
 {
     char *good_data = "test";
@@ -124,7 +124,7 @@ START_TEST(test_m_addfriend)
     int bad_len = strlen(bad_data);
     int really_bad_len = (MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES
                      - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES
-                                         + crypto_box_ZEROBYTES + 100);
+*/                                         + crypto_box_ZEROBYTES + 100);
 /* TODO: Update this properly to latest master
     if(m_addfriend(m, (uint8_t *)friend_id, (uint8_t *)good_data, really_bad_len) != FAERR_TOOLONG)
         ck_abort_msg("m_addfriend did NOT catch the following length: %d\n", really_bad_len);
@@ -144,9 +144,9 @@ START_TEST(test_m_addfriend)
     if(m_addfriend((uint8_t *)bad_id, (uint8_t *)good_data, good_len) >= 0)
         ck_abort_msg("The following ID passed through "
               "m_addfriend without an error:\n'%s'\n", bad_id_str);
-    */
+    
 }
-END_TEST
+END_TEST */
 
 START_TEST(test_setname)
 {
@@ -232,7 +232,7 @@ Suite *messenger_suite(void)
     tcase_add_test(getself_name, test_getself_name);
     tcase_add_test(send_message, test_m_sendmesage);
     tcase_add_test(delfriend, test_m_delfriend);
-    tcase_add_test(addfriend, test_m_addfriend);
+    //tcase_add_test(addfriend, test_m_addfriend);
     tcase_add_test(setname, test_setname);
 
     suite_add_tcase(s, userstatus_size);