diff --git a/message/tests/api_test.php b/message/tests/api_test.php
index d983273e339..b72aab89d50 100644
--- a/message/tests/api_test.php
+++ b/message/tests/api_test.php
@@ -224,6 +224,15 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
         $course3->shortname = 'Three search';
         $course3 = $this->getDataGenerator()->create_course($course3);
 
+        $course4 = new stdClass();
+        $course4->fullname = 'Course Four';
+        $course4->shortname = 'CF100';
+        $course4 = $this->getDataGenerator()->create_course($course4);
+
+        $this->getDataGenerator()->enrol_user($user1->id, $course1->id, 'student');
+        $this->getDataGenerator()->enrol_user($user1->id, $course2->id, 'student');
+        $this->getDataGenerator()->enrol_user($user1->id, $course3->id, 'student');
+
         // Add some users as contacts.
         message_add_contact($user2->id, 0, $user1->id);
         message_add_contact($user3->id, 0, $user1->id);
diff --git a/message/tests/externallib_test.php b/message/tests/externallib_test.php
index 8c371e06266..e8584b1bf93 100644
--- a/message/tests/externallib_test.php
+++ b/message/tests/externallib_test.php
@@ -1172,6 +1172,15 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
         $course3->shortname = 'Three search';
         $course3 = $this->getDataGenerator()->create_course($course3);
 
+        $course4 = new stdClass();
+        $course4->fullname = 'Course Four';
+        $course4->shortname = 'CF100';
+        $course4 = $this->getDataGenerator()->create_course($course4);
+
+        $this->getDataGenerator()->enrol_user($user1->id, $course1->id, 'student');
+        $this->getDataGenerator()->enrol_user($user1->id, $course2->id, 'student');
+        $this->getDataGenerator()->enrol_user($user1->id, $course3->id, 'student');
+
         // Add some users as contacts.
         message_add_contact($user2->id, 0, $user1->id);
         message_add_contact($user3->id, 0, $user1->id);
@@ -1283,9 +1292,7 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
         $this->assertEquals($user2->id, $contacts[1]['userid']);
 
         // Check that we retrieved the correct courses.
-        $this->assertCount(2, $courses);
-        $this->assertEquals($course3->id, $courses[0]['id']);
-        $this->assertEquals($course1->id, $courses[1]['id']);
+        $this->assertCount(0, $courses);
 
         // Check that we retrieved the correct non-contacts.
         $this->assertCount(1, $noncontacts);