diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c
index b634cfd2..5e8656b7 100644
--- a/tests/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
@@ -101,6 +101,8 @@ int main(int argc, char* argv[]) {
PROF_FUNC_TEST(shows_history_message),
PROF_FUNC_TEST(shows_occupant_join),
PROF_FUNC_TEST(shows_message),
+ PROF_FUNC_TEST(shows_me_message_from_occupant),
+ PROF_FUNC_TEST(shows_me_message_from_self),
PROF_FUNC_TEST(shows_all_messages_in_console_when_window_not_focussed),
PROF_FUNC_TEST(shows_first_message_in_console_when_window_not_focussed),
PROF_FUNC_TEST(shows_no_message_in_console_when_window_not_focussed),
diff --git a/tests/functionaltests/test_muc.c b/tests/functionaltests/test_muc.c
index e7fc8dcb..3aac9988 100644
--- a/tests/functionaltests/test_muc.c
+++ b/tests/functionaltests/test_muc.c
@@ -208,6 +208,60 @@ shows_message(void **state)
assert_true(prof_output_regex("testoccupant: .+a new message"));
}
+void
+shows_me_message_from_occupant(void **state)
+{
+ prof_connect();
+
+ stbbr_for_id("prof_join_4",
+ ""
+ ""
+ ""
+ " "
+ ""
+ ""
+ ""
+ );
+
+ prof_input("/join testroom@conference.localhost");
+ assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));
+
+ stbbr_send(
+ ""
+ "/me did something"
+ ""
+ );
+
+ assert_true(prof_output_exact("*testoccupant did something"));
+}
+
+void
+shows_me_message_from_self(void **state)
+{
+ prof_connect();
+
+ stbbr_for_id("prof_join_4",
+ ""
+ ""
+ ""
+ " "
+ ""
+ ""
+ ""
+ );
+
+ prof_input("/join testroom@conference.localhost");
+ assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));
+
+ stbbr_send(
+ ""
+ "/me did something"
+ ""
+ );
+
+ assert_true(prof_output_exact("*stabber did something"));
+}
+
void
shows_all_messages_in_console_when_window_not_focussed(void **state)
{
diff --git a/tests/functionaltests/test_muc.h b/tests/functionaltests/test_muc.h
index 4f3c4f5d..1636bd05 100644
--- a/tests/functionaltests/test_muc.h
+++ b/tests/functionaltests/test_muc.h
@@ -7,6 +7,8 @@ void shows_subject_on_join(void **state);
void shows_history_message(void **state);
void shows_occupant_join(void **state);
void shows_message(void **state);
+void shows_me_message_from_occupant(void **state);
+void shows_me_message_from_self(void **state);
void shows_all_messages_in_console_when_window_not_focussed(void **state);
void shows_first_message_in_console_when_window_not_focussed(void **state);
void shows_no_message_in_console_when_window_not_focussed(void **state);