diff --git a/test/map_codec_tests.erl b/test/map_codec_tests.erl
index 96460bc..c91fdb8 100644
--- a/test/map_codec_tests.erl
+++ b/test/map_codec_tests.erl
@@ -5,14 +5,18 @@
 
 -include("map.hrl").
 -include_lib("osmo_ss7/include/isup.hrl").
+-include_lib("osmo_ss7/include/m2ua.hrl").
+-include_lib("osmo_ss7/include/mtp3.hrl").
+-include_lib("osmo_ss7/include/sccp.hrl").
 
 -define(TCAP_MSG_BIN, <<100,65,73,4,81,1,2,200,107,42,40,40,6,7,0,17,134,5,1,1,1,160,29,97,27,128,2,7,128,161,9,6,7,4,0,0,1,0,1,3,162,3,2,1,0,163,5,161,3,2,1,0,108,13,163,11,2,1,64,2,1,8,48,3,10,1,0>>).
 -define(TCAP_MSG_DEC, {'end',{'MapSpecificPDUs_end',[81,1,2,200],{'EXTERNAL',{syntax,{0,0,17,773,1,1,1}},asn1_NOVALUE,[97,27,128,2,7,128,161,9,6,7,4,0,0,1,0,1,3,162,3,2,1,0,163,5,161,3,2,1,0]},[{basicROS,{returnError,{'MapSpecificPDUs_end_components_SEQOF_basicROS_returnError',{present,64},{local,8},{'RoamingNotAllowedParam',plmnRoamingNotAllowed,asn1_NOVALUE}}}}]}}).
 
 parse_test() ->
 	?assertEqual(?TCAP_MSG_DEC, map_codec:parse_tcap_msg(?TCAP_MSG_BIN)).
-encode_test() ->
-	?assertEqual(?TCAP_MSG_BIN, map_codec:encode_tcap_msg(?TCAP_MSG_DEC)).
+% BER allows for different binary encodings of each message, the test below is not valid
+%encode_test() ->
+%	?assertEqual(?TCAP_MSG_BIN, map_codec:encode_tcap_msg(?TCAP_MSG_DEC)).
 
 -define(ADDR_DEC, #party_number{nature_of_addr_ind = ?ISUP_ADDR_NAT_INTERNATIONAL,
 				internal_net_num = undefined,
@@ -32,3 +36,48 @@
 	?assertEqual(?ADDR_DEC, map_codec:parse_addr_string(?ADDR_LIST)).
 decode_addr_bin_test() ->
 	?assertEqual(?ADDR_DEC, map_codec:parse_addr_string(list_to_binary(?ADDR_LIST))).
+
+
+pcap_parse_test_() ->
+	{ timeout, 5*60, [ fun pcap_parse_t/0 ] }.
+
+% parser test for real-world MAP/TCAP data
+pcap_parse_t() ->
+	Args = [{rewrite_fn, fun pcap_cb/5}],
+	File = "../priv/map.pcap",
+	case file:read_file_info(File) of
+		{ok, _Info} ->
+			{ok, NrPkts} = ?debugTime("PCAP", osmo_ss7_pcap:pcap_apply(File, "", Args)),
+			?debugFmt("Parsed ~p PCAP packets~n", [NrPkts]);
+		{error, _Reason} ->
+			?debugFmt("Skipping PCAP based tests as no ~p could be found~n",
+				  [File])
+	end.
+
+pcap_cb(sctp, _From, _Path, 2, DataBin) ->
+	{ok, M2ua} = m2ua_codec:parse_m2ua_msg(DataBin),
+	handle_m2ua(M2ua).
+
+handle_m2ua(#m2ua_msg{msg_class = ?M2UA_MSGC_MAUP,
+		      msg_type = ?M2UA_MAUP_MSGT_DATA,
+		      parameters = Params}) ->
+	{_Len, M2uaPayload} = proplists:get_value(16#300, Params),
+	Mtp3 = mtp3_codec:parse_mtp3_msg(M2uaPayload),
+	handle_mtp3(Mtp3);
+handle_m2ua(M2ua = #m2ua_msg{}) ->
+	M2ua.
+
+handle_mtp3(#mtp3_msg{service_ind = ?MTP3_SERV_SCCP,
+		      payload = Payload}) ->
+	{ok, SccpDec} = sccp_codec:parse_sccp_msg(Payload),
+	SccpEnc = handle_sccp(SccpDec);
+handle_mtp3(Mtp3 = #mtp3_msg{}) ->
+	Mtp3.
+
+handle_sccp(S = #sccp_msg{msg_type = ?SCCP_MSGT_UDT, parameters = Params}) ->
+	UserData = proplists:get_value(user_data, Params),
+	MapDec = map_codec:parse_tcap_msg(UserData),
+	MapReEnc = map_codec:encode_tcap_msg(MapDec),
+	S;
+handle_sccp(S = #sccp_msg{}) ->
+	S.