diff --git a/lib/s1ap3/test/s1ap_build.c b/lib/s1ap3/test/s1ap_build.c
index 6cadf0ac8..9ac8fbf55 100644
--- a/lib/s1ap3/test/s1ap_build.c
+++ b/lib/s1ap3/test/s1ap_build.c
@@ -103,7 +103,12 @@ status_t s1ap_build_setup_failure(
     d_trace(5, "    Group[%d] Cause[%d] TimeToWait[%ld]\n",
             group, cause, time_to_wait);
 
-    unsuccessfulOutcome = core_calloc(1, sizeof(S1AP_UnsuccessfulOutcome_t));
+    memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
+    pdu.present = S1AP_PDU_PR_unsuccessfulOutcome;
+    pdu.choice.unsuccessfulOutcome = 
+        core_calloc(1, sizeof(S1AP_UnsuccessfulOutcome_t));
+
+    unsuccessfulOutcome = pdu.choice.unsuccessfulOutcome;
     unsuccessfulOutcome->procedureCode = S1AP_ProcedureCode_S1AP_id_S1Setup;
     unsuccessfulOutcome->criticality = S1AP_Criticality_reject;
     unsuccessfulOutcome->value.present =
@@ -111,31 +116,32 @@ status_t s1ap_build_setup_failure(
 
     S1SetupFailure = &unsuccessfulOutcome->value.choice.S1SetupFailure;
 
-    ie = core_calloc(1, sizeof(S1AP_S1SetupRequestIEs_t));
+    ie = core_calloc(1, sizeof(S1AP_S1SetupFailureIEs_t));
+    ASN_SEQUENCE_ADD(&S1SetupFailure->protocolIEs, ie);
+
     ie->id = S1AP_ProtocolIE_ID_S1AP_id_Cause;
     ie->criticality = S1AP_Criticality_ignore;
     ie->value.present = S1SetupFailureIEs__value_PR_Cause;
-    ASN_SEQUENCE_ADD(&S1SetupFailure->protocolIEs, ie);
 
     Cause = &ie->value.choice.Cause;
-    Cause->present = group;
-    Cause->choice.radioNetwork = cause;
 
     if (time_to_wait > -1)
     {
-        ie = core_calloc(1, sizeof(S1AP_S1SetupRequestIEs_t));
+        ie = core_calloc(1, sizeof(S1AP_S1SetupFailureIEs_t));
+        ASN_SEQUENCE_ADD(&S1SetupFailure->protocolIEs, ie);
+
         ie->id = S1AP_ProtocolIE_ID_S1AP_id_TimeToWait;
         ie->criticality = S1AP_Criticality_ignore;
         ie->value.present = S1SetupFailureIEs__value_PR_TimeToWait;
-        ASN_SEQUENCE_ADD(&S1SetupFailure->protocolIEs, ie);
 
         TimeToWait = &ie->value.choice.TimeToWait;
-        *TimeToWait = time_to_wait;
     }
 
-    memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
-    pdu.present = S1AP_PDU_PR_unsuccessfulOutcome;
-    pdu.choice.unsuccessfulOutcome = unsuccessfulOutcome;
+    Cause->present = group;
+    Cause->choice.radioNetwork = cause;
+
+    if (TimeToWait)
+        *TimeToWait = time_to_wait;
 
     rv = s1ap_encode_pdu(pkbuf, &pdu);
     s1ap_free_pdu(&pdu);
diff --git a/lib/s1ap3/test/s1ap_message_test.c b/lib/s1ap3/test/s1ap_message_test.c
index 377f41c03..da89cc9d6 100644
--- a/lib/s1ap3/test/s1ap_message_test.c
+++ b/lib/s1ap3/test/s1ap_message_test.c
@@ -277,7 +277,7 @@ static void s1ap_message_test4(abts_case *tc, void *data)
 
     result = s1ap_decode_pdu(&message, pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
-#if 0
+#if 1
     asn_fprint(stdout, &asn_DEF_S1AP_S1AP_PDU, &message);
 #endif