diff --git a/selftest/template_test.ok b/selftest/template_test.ok
index 5bd32a4..dcfacc2 100644
--- a/selftest/template_test.ok
+++ b/selftest/template_test.ok
@@ -38,7 +38,7 @@
  bts 0
   type val_type_bts0
   band val_band_bts0
-  cell_identity 0
+  cell_identity val_bts.cell_identity_bts0
   location_area_code val_bts.location_area_code_bts0
   training_sequence_code 7
   base_station_id_code val_bts.base_station_id_code_bts0
@@ -82,7 +82,7 @@
  bts 1
   type val_type_bts1
   band val_band_bts1
-  cell_identity 0
+  cell_identity val_bts.cell_identity_bts1
   location_area_code val_bts.location_area_code_bts1
   training_sequence_code 7
   base_station_id_code val_bts.base_station_id_code_bts1
diff --git a/selftest/template_test.py b/selftest/template_test.py
index 769df49..0c83632 100755
--- a/selftest/template_test.py
+++ b/selftest/template_test.py
@@ -22,6 +22,7 @@
     'osmobsc_bts_type': 'val_type',
     'band': 'val_band',
     'location_area_code': 'val_bts.location_area_code',
+    'cell_identity': 'val_bts.cell_identity',
     'base_station_id_code': 'val_bts.base_station_id_code',
     'ipa_unit_id': 'val_bts.unit_id',
     'stream_id': 'val_bts.stream_id',
diff --git a/selftest/template_test/osmo-nitb.cfg.tmpl b/selftest/template_test/osmo-nitb.cfg.tmpl
index 2559b14..f1508ec 100644
--- a/selftest/template_test/osmo-nitb.cfg.tmpl
+++ b/selftest/template_test/osmo-nitb.cfg.tmpl
@@ -54,7 +54,7 @@
  bts ${loop.index}
   type ${bts.type}
   band ${bts.band}
-  cell_identity 0
+  cell_identity ${bts.cell_identity}
   location_area_code ${bts.location_area_code}
   training_sequence_code 7
   base_station_id_code ${bts.base_station_id_code}