diff --git a/tests/125-bitstring-constraint-OK.asn1.-P b/tests/125-bitstring-constraint-OK.asn1.-P
index 930b110..2a9b2df 100644
--- a/tests/125-bitstring-constraint-OK.asn1.-P
+++ b/tests/125-bitstring-constraint-OK.asn1.-P
@@ -55,72 +55,6 @@
  * This type is implemented using BIT_STRING,
  * so here we adjust the DEF accordingly.
  */
-static void
-T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
-	td->free_struct    = asn_DEF_BIT_STRING.free_struct;
-	td->print_struct   = asn_DEF_BIT_STRING.print_struct;
-	td->check_constraints = asn_DEF_BIT_STRING.check_constraints;
-	td->ber_decoder    = asn_DEF_BIT_STRING.ber_decoder;
-	td->der_encoder    = asn_DEF_BIT_STRING.der_encoder;
-	td->xer_decoder    = asn_DEF_BIT_STRING.xer_decoder;
-	td->xer_encoder    = asn_DEF_BIT_STRING.xer_encoder;
-	td->uper_decoder   = asn_DEF_BIT_STRING.uper_decoder;
-	td->uper_encoder   = asn_DEF_BIT_STRING.uper_encoder;
-	td->oer_decoder    = asn_DEF_BIT_STRING.oer_decoder;
-	td->oer_encoder    = asn_DEF_BIT_STRING.oer_encoder;
-	if(!td->oer_constraints)
-		td->oer_constraints = asn_DEF_BIT_STRING.oer_constraints;
-	if(!td->per_constraints)
-		td->per_constraints = asn_DEF_BIT_STRING.per_constraints;
-	td->elements       = asn_DEF_BIT_STRING.elements;
-	td->elements_count = asn_DEF_BIT_STRING.elements_count;
-	td->specifics      = asn_DEF_BIT_STRING.specifics;
-}
-
-void
-T_free(asn_TYPE_descriptor_t *td,
-		void *struct_ptr, int contents_only) {
-	T_1_inherit_TYPE_descriptor(td);
-	td->free_struct(td, struct_ptr, contents_only);
-}
-
-int
-T_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
-		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	T_1_inherit_TYPE_descriptor(td);
-	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
-}
-
-asn_dec_rval_t
-T_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
-		void **structure, const void *bufptr, size_t size, int tag_mode) {
-	T_1_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
-}
-
-asn_enc_rval_t
-T_encode_der(asn_TYPE_descriptor_t *td,
-		void *structure, int tag_mode, ber_tlv_tag_t tag,
-		asn_app_consume_bytes_f *cb, void *app_key) {
-	T_1_inherit_TYPE_descriptor(td);
-	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
-}
-
-asn_dec_rval_t
-T_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
-		void **structure, const char *opt_mname, const void *bufptr, size_t size) {
-	T_1_inherit_TYPE_descriptor(td);
-	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
-}
-
-asn_enc_rval_t
-T_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
-		int ilevel, enum xer_encoder_flags_e flags,
-		asn_app_consume_bytes_f *cb, void *app_key) {
-	T_1_inherit_TYPE_descriptor(td);
-	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
-}
-
 
 /*** <<< STAT-DEFS [T] >>> ***/
 
@@ -130,13 +64,13 @@
 asn_TYPE_descriptor_t asn_DEF_T = {
 	"T",
 	"T",
-	T_free,
-	T_print,
+	BIT_STRING_free,
+	BIT_STRING_print,
 	T_constraint,
-	T_decode_ber,
-	T_encode_der,
-	T_decode_xer,
-	T_encode_xer,
+	BIT_STRING_decode_ber,
+	BIT_STRING_encode_der,
+	BIT_STRING_decode_xer,
+	BIT_STRING_encode_xer,
 	0, 0,	/* No OER support, use "-gen-OER" to enable */
 	0, 0,	/* No PER support, use "-gen-PER" to enable */
 	0,	/* Use generic outmost tag fetcher */
@@ -149,6 +83,6 @@
 	0,	/* No OER visible constraints */
 	0,	/* No PER visible constraints */
 	0, 0,	/* Defined elsewhere */
-	0	/* No specifics */
+	&asn_SPC_BIT_STRING_specs	/* Additional specs */
 };