diff --git a/library/L3_Common.ttcn b/library/L3_Common.ttcn
index 57db6b3..01f0a34 100644
--- a/library/L3_Common.ttcn
+++ b/library/L3_Common.ttcn
@@ -106,9 +106,9 @@
 		  rai.mccDigit1
 		& rai.mccDigit2
 		& rai.mccDigit3
+		& rai.mncDigit3
 		& rai.mncDigit1
-		& rai.mncDigit2
-		& rai.mncDigit3;
+		& rai.mncDigit2;
 	return plmn;
 }
 
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 95d3028..55a2816 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -868,8 +868,8 @@
 				ret.mccDigit2 := cid.ra_id.lai.mcc_mnc[1];
 				ret.mccDigit3 := cid.ra_id.lai.mcc_mnc[2];
 				ret.mncDigit3 := cid.ra_id.lai.mcc_mnc[3];
-				ret.mncDigit2 := cid.ra_id.lai.mcc_mnc[5];
 				ret.mncDigit1 := cid.ra_id.lai.mcc_mnc[4];
+				ret.mncDigit2 := cid.ra_id.lai.mcc_mnc[5];
 			}
 			if (isvalue(cid.ra_id.lai.lac)) {
 				ret.lac := f_oct_or_wc(cid.ra_id.lai.lac, 2);
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 8b639e6..74cdece 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -137,15 +137,16 @@
 };
 
 private function f_cellid_to_RAI(in BssgpCellId cell_id) return RoutingAreaIdentificationV {
+	/* mcc_mnc is encoded as of 24.008 10.5.5.15 */
 	var BcdMccMnc mcc_mnc := cell_id.ra_id.lai.mcc_mnc;
 
         var RoutingAreaIdentificationV ret := {
                 mccDigit1 := mcc_mnc[0],
                 mccDigit2 := mcc_mnc[1],
                 mccDigit3 := mcc_mnc[2],
-                mncDigit3 := mcc_mnc[5],
-                mncDigit1 := mcc_mnc[3],
-                mncDigit2 := mcc_mnc[4],
+                mncDigit3 := mcc_mnc[3],
+                mncDigit1 := mcc_mnc[4],
+                mncDigit2 := mcc_mnc[5],
                 lac := int2oct(cell_id.ra_id.lai.lac, 16),
                 rac := int2oct(cell_id.ra_id.rac, 8)
         }
@@ -225,7 +226,8 @@
 }
 
 
-function f_init(BcdMccMnc mcc_mnc := '26242F'H) runs on test_CT {
+/* mcc_mnc is 24.008 10.5.5.15 encoded. 262 42 */
+function f_init(BcdMccMnc mcc_mnc := '262F42'H) runs on test_CT {
 	if (g_initialized == true) {
 		return;
 	}