diff --git a/lib/include/srslte/asn1/liblte_mme.h b/lib/include/srslte/asn1/liblte_mme.h
index e5f13615b..7c89b97c7 100644
--- a/lib/include/srslte/asn1/liblte_mme.h
+++ b/lib/include/srslte/asn1/liblte_mme.h
@@ -2385,9 +2385,13 @@ const char* liblte_nas_sec_hdr_type_to_string(int code);
 #define LIBLTE_MME_MSG_TYPE_CS_SERVICE_NOTIFICATION 0x64
 #define LIBLTE_MME_MSG_TYPE_DOWNLINK_GENERIC_NAS_TRANSPORT 0x68
 #define LIBLTE_MME_MSG_TYPE_UPLINK_GENERIC_NAS_TRANSPORT 0x69
+#define LIBLTE_MME_MSG_TYPE_CLOSE_UE_TEST_LOOP 0x80
+#define LIBLTE_MME_MSG_TYPE_CLOSE_UE_TEST_LOOP_COMPLETE 0x81
+#define LIBLTE_MME_MSG_TYPE_OPEN_UE_TEST_LOOP 0x82
+#define LIBLTE_MME_MSG_TYPE_OPEN_UE_TEST_LOOP_COMPLETE 0x83
 #define LIBLTE_MME_MSG_TYPE_ACTIVATE_TEST_MODE 0x84
 #define LIBLTE_MME_MSG_TYPE_ACTIVATE_TEST_MODE_COMPLETE 0x85
-#define LIBLTE_MME_MSG_TYPE_DEACTIVATE_TEST MODE 0x86
+#define LIBLTE_MME_MSG_TYPE_DEACTIVATE_TEST_MODE 0x86
 #define LIBLTE_MME_MSG_TYPE_DEACTIVATE_TEST_MODE_COMPLETE 0x87
 #define LIBLTE_MME_MSG_TYPE_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST 0xC1
 #define LIBLTE_MME_MSG_TYPE_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_ACCEPT 0xC2
diff --git a/srsue/src/stack/upper/nas.cc b/srsue/src/stack/upper/nas.cc
index 9b4bd9bea..43c078163 100644
--- a/srsue/src/stack/upper/nas.cc
+++ b/srsue/src/stack/upper/nas.cc
@@ -613,6 +613,10 @@ void nas::write_pdu(uint32_t lcid, unique_byte_buffer_t pdu)
     case LIBLTE_MME_MSG_TYPE_ACTIVATE_TEST_MODE:
       parse_activate_test_mode(lcid, std::move(pdu), sec_hdr_type);
       break;
+    // TODO: Handle deactivate test mode and ue close/open
+    case LIBLTE_MME_MSG_TYPE_DEACTIVATE_TEST_MODE:
+    case LIBLTE_MME_MSG_TYPE_CLOSE_UE_TEST_LOOP:
+    case LIBLTE_MME_MSG_TYPE_OPEN_UE_TEST_LOOP:
     default:
       nas_log->error("Not handling NAS message with MSG_TYPE=%02X\n", msg_type);
       return;