diff --git a/src/sgw/sgw_gtp_path.c b/src/sgw/sgw_gtp_path.c
index 837d51546c..9d26826e09 100644
--- a/src/sgw/sgw_gtp_path.c
+++ b/src/sgw/sgw_gtp_path.c
@@ -129,12 +129,7 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
         d_assert(bearer, pkbuf_free(pkbuf); return 0, "Null param");
 
         /* Convert TEID */
-        if (tunnel->interface_type == 
-                GTP_F_TEID_S1_U_SGW_GTP_U ||
-            tunnel->interface_type ==
-                GTP_F_TEID_SGW_GTP_U_FOR_DL_DATA_FORWARDING ||
-            tunnel->interface_type ==
-                GTP_F_TEID_SGW_GTP_U_FOR_UL_DATA_FORWARDING)
+        if (tunnel->interface_type == GTP_F_TEID_S1_U_SGW_GTP_U)
         {
             sgw_tunnel_t *s5u_tunnel = NULL;
 
diff --git a/test/attach_test.c b/test/attach_test.c
index 1183600ccc..1da4ac6a35 100644
--- a/test/attach_test.c
+++ b/test/attach_test.c
@@ -1548,12 +1548,10 @@ abts_suite *test_attach(abts_suite *suite)
     suite = ADD_SUITE(suite)
 
     abts_run_test(suite, attach_test1, NULL);
-#if 0
     abts_run_test(suite, attach_test2, NULL);
     abts_run_test(suite, attach_test3, NULL);
     abts_run_test(suite, attach_test4, NULL);
     abts_run_test(suite, attach_test5, NULL);
-#endif
 
     return suite;
 }