diff --git a/tests/msc4115/msc4115_test.go b/tests/csapi/membership_on_events_test.go
similarity index 89%
rename from tests/msc4115/msc4115_test.go
rename to tests/csapi/membership_on_events_test.go
index 4f5bb852..c3291ab5 100644
--- a/tests/msc4115/msc4115_test.go
+++ b/tests/csapi/membership_on_events_test.go
@@ -1,4 +1,4 @@
-package tests
+package csapi_tests
 
 import (
 	"github.com/matrix-org/complement/b"
@@ -10,11 +10,11 @@ import (
 	"github.com/matrix-org/complement/helpers"
 )
 
-// MSC4115: membership information on events
+// Membership information on events served to clients, as specified in MSC4115.
 //
-// Alice sends one message before bob joins, then one after. Bob reads both messages, and checks the membership state
+// Alice sends one message before Bob joins, then one after. Bob reads both messages, and checks the membership state
 // on each.
-func TestMSC4115(t *testing.T) {
+func TestMembershipOnEvents(t *testing.T) {
 	runtime.SkipIf(t, runtime.Dendrite) // not yet implemented
 
 	deployment := complement.Deploy(t, 1)
@@ -52,7 +52,7 @@ func TestMSC4115(t *testing.T) {
 		if ev.Get("type").Str == "m.room.member" && ev.Get("state_key").Str == bob.UserID {
 			haveSeenJoin = true
 		}
-		membership := ev.Get("unsigned." + client.GjsonEscape("io.element.msc4115.membership")).Str
+		membership := ev.Get("unsigned.membership").Str
 		expectedMembership := "leave"
 		if haveSeenJoin {
 			expectedMembership = "join"
diff --git a/tests/msc4115/main_test.go b/tests/msc4115/main_test.go
deleted file mode 100644
index edb9d0f0..00000000
--- a/tests/msc4115/main_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package tests
-
-import (
-	"testing"
-
-	"github.com/matrix-org/complement"
-)
-
-func TestMain(m *testing.M) {
-	complement.TestMain(m, "msc4115")
-}