diff --git a/GSMDriver.st b/GSMDriver.st
index 3fa825b..da5c626 100644
--- a/GSMDriver.st
+++ b/GSMDriver.st
@@ -20,7 +20,7 @@ PackageLoader fileInPackage: #OsmoASN1.
 
 OsmoGSM.SCCPConnectionBase subclass: GSMConnection [
     | sapis completeSem phoneConfig mainProc |
-    <category: 'osmo-gsm-operation'>
+    <category: 'OsmoTestPhone'>
     <comment: 'I create a SCCP connection and handle stuff on it. In the base class
 I am just capable of handling BSSMAP Management and need to dispatch it to other
 classes.'>
@@ -203,6 +203,7 @@ classes.'>
 Object subclass: ProcedureBase [
     | success conn |
 
+    <category: 'OsmoTestPhone'>
     <comment: 'I provide a transaction base class for a given SAPI'>
     <import: OsmoGSM>
 
@@ -255,6 +256,8 @@ Object subclass: ProcedureBase [
 ]
 
 ProcedureBase subclass: IMSIDetachProcedure [
+    <category: 'OsmoTestPhone'>
+
     initialMessage [
         | detach |
 
@@ -279,6 +282,8 @@ ProcedureBase subclass: IMSIDetachProcedure [
 ]
 
 ProcedureBase subclass: LUProcedure [
+    <category: 'OsmoTestPhone'>
+
     initialMessage [
         | lu |
 
@@ -306,6 +311,7 @@ ProcedureBase subclass: LUProcedure [
 
 ProcedureBase subclass: CallProcedure [
     | nr |
+    <category: 'OsmoTestPhone'>
 
     CallProcedure class >> initWithNr: aNr [
         ^ self new
@@ -385,6 +391,7 @@ ProcedureBase subclass: CallProcedure [
 ProcedureBase subclass: USSDProcedure [
     | nr facility |
 
+    <category: 'OsmoTestPhone'>
     <import: Osmo>
 
     USSDProcedure class >> initWithNr: aNr [
diff --git a/TestPhone.st b/TestPhone.st
index b65dc44..ddb4710 100644
--- a/TestPhone.st
+++ b/TestPhone.st
@@ -21,6 +21,7 @@ PackageLoader fileInPackage: 'OsmoGSM'.
 
 Object subclass: IPAConnection [
     | socket demuxer queue muxer dispatcher sccp ipa sem |
+    <category: 'OsmoTestPhone'>
     <import: OsmoGSM>
 
     IPAConnection class >> initWith: anAddr port: aPort token: aToken [
@@ -98,6 +99,7 @@ Object subclass: IPAConnection [
 
 Object subclass: IPAConfig [
     | addr port token connection sem |
+    <category: 'OsmoTestPhone'>
 
     addr: anAddr port: aPort [
         addr := anAddr.
@@ -182,6 +184,7 @@ Object subclass: IPAConfig [
 Object subclass: PhoneConfig [
     | imsi auKey auVer |
 
+    <category: 'OsmoTestPhone'>
     <comment: 'I am the config of a phone. I do have an IMSI and such.'>
 
     PhoneConfig class >> initWith: aImsi auKey: anAuKey [