diff --git a/Makefile.am b/Makefile.am
index 32516ab0..8bd2de22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,6 +81,7 @@ tests_sources = \
 	tests/test_contact.c tests/test_contact.h \
 	tests/test_form.c tests/test_form.h \
 	tests/test_history.c tests/test_history.h \
+	tests/test_jid.c tests/test_jid.h \
 	tests/test_autocomplete.c tests/test_autocomplete.h \
 	tests/testsuite.c
 
diff --git a/tests/testsuite.c b/tests/testsuite.c
index f7bc6d6f..d8070a54 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -108,7 +108,6 @@ int main(int argc, char* argv[]) {
         unit_test(edit_previous_and_append),
         unit_test(start_session_add_new_submit_previous),
 
-/*
         unit_test(create_jid_from_null_returns_null),
         unit_test(create_jid_from_empty_string_returns_null),
         unit_test(create_jid_from_full_returns_full),
@@ -135,6 +134,7 @@ int main(int argc, char* argv[]) {
         unit_test(returns_fulljid_when_exists),
         unit_test(returns_barejid_when_fulljid_not_exists),
 
+/*
         unit_test(parse_null_returns_null),
         unit_test(parse_empty_returns_null),
         unit_test(parse_space_returns_null),