diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp
index 7255da3..4e9c7e2 100644
--- a/tests/ms/MsTest.cpp
+++ b/tests/ms/MsTest.cpp
@@ -196,36 +196,42 @@
 	OSMO_ASSERT(!ms->is_idle());
 	OSMO_ASSERT(ms->ul_tbf() == NULL);
 	OSMO_ASSERT(ms->dl_tbf() == dl_tbf[0]);
+	OSMO_ASSERT(llist_empty(&ms->old_tbfs()));
 	OSMO_ASSERT(!was_idle);
 
 	ms->attach_tbf(dl_tbf[1]);
 	OSMO_ASSERT(!ms->is_idle());
 	OSMO_ASSERT(ms->ul_tbf() == NULL);
 	OSMO_ASSERT(ms->dl_tbf() == dl_tbf[1]);
+	OSMO_ASSERT(!llist_empty(&ms->old_tbfs()));
 	OSMO_ASSERT(!was_idle);
 
 	ms->attach_tbf(ul_tbf);
 	OSMO_ASSERT(!ms->is_idle());
 	OSMO_ASSERT(ms->ul_tbf() == ul_tbf);
 	OSMO_ASSERT(ms->dl_tbf() == dl_tbf[1]);
+	OSMO_ASSERT(!llist_empty(&ms->old_tbfs()));
 	OSMO_ASSERT(!was_idle);
 
 	ms->detach_tbf(ul_tbf);
 	OSMO_ASSERT(!ms->is_idle());
 	OSMO_ASSERT(ms->ul_tbf() == NULL);
 	OSMO_ASSERT(ms->dl_tbf() == dl_tbf[1]);
+	OSMO_ASSERT(!llist_empty(&ms->old_tbfs()));
 	OSMO_ASSERT(!was_idle);
 
 	ms->detach_tbf(dl_tbf[0]);
 	OSMO_ASSERT(!ms->is_idle());
 	OSMO_ASSERT(ms->ul_tbf() == NULL);
 	OSMO_ASSERT(ms->dl_tbf() == dl_tbf[1]);
+	OSMO_ASSERT(llist_empty(&ms->old_tbfs()));
 	OSMO_ASSERT(!was_idle);
 
 	ms->detach_tbf(dl_tbf[1]);
 	OSMO_ASSERT(ms->is_idle());
 	OSMO_ASSERT(ms->ul_tbf() == NULL);
 	OSMO_ASSERT(ms->dl_tbf() == NULL);
+	OSMO_ASSERT(llist_empty(&ms->old_tbfs()));
 	OSMO_ASSERT(was_idle);
 
 	delete ms;
diff --git a/tests/ms/MsTest.err b/tests/ms/MsTest.err
index ed53f48..a2e4a0c 100644
--- a/tests/ms/MsTest.err
+++ b/tests/ms/MsTest.err
@@ -13,10 +13,10 @@
 Creating MS object, TLLI = 0xffeeddbb
 Attaching TBF to MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL)
 Attaching TBF to MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL)
-Detaching TBF from MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL)
 Attaching TBF to MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL)
 Detaching TBF from MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL)
 Detaching TBF from MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL)
+Detaching TBF from MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL)
 Destroying MS object, TLLI = 0xffeeddbb
 Creating MS object, TLLI = 0xaa000000
 Modifying MS object, UL TLLI: 0xaa000000 -> 0xff001111, not yet confirmed