diff --git a/apps/emqx_gateway/test/emqx_sn_frame_SUITE.erl b/apps/emqx_gateway/test/emqx_sn_frame_SUITE.erl
index 335e00b20..a616bc1e9 100644
--- a/apps/emqx_gateway/test/emqx_sn_frame_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_sn_frame_SUITE.erl
@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx_gateway/src/mqttsn/include/emqx_sn.hrl").
+-include("emqx_sn.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 %%--------------------------------------------------------------------
@@ -181,4 +181,3 @@ gen_next(0, Acc) ->
 gen_next(N, Acc) ->
     Byte = rand:uniform(256) - 1,
     gen_next(N-1, <<Acc/binary, Byte:8>>).
-
diff --git a/apps/emqx_gateway/test/emqx_sn_protocol_SUITE.erl b/apps/emqx_gateway/test/emqx_sn_protocol_SUITE.erl
index c637f44c2..557f43480 100644
--- a/apps/emqx_gateway/test/emqx_sn_protocol_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_sn_protocol_SUITE.erl
@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx_gateway/src/mqttsn/include/emqx_sn.hrl").
+-include("emqx_sn.hrl").
 
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
diff --git a/apps/emqx_gateway/test/emqx_stomp_SUITE.erl b/apps/emqx_gateway/test/emqx_stomp_SUITE.erl
index 6dd6860b7..c58b95935 100644
--- a/apps/emqx_gateway/test/emqx_stomp_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_stomp_SUITE.erl
@@ -17,7 +17,7 @@
 -module(emqx_stomp_SUITE).
 
 -include_lib("eunit/include/eunit.hrl").
--include_lib("emqx_gateway/src/stomp/include/emqx_stomp.hrl").
+-include("emqx_stomp.hrl").
 
 -compile(export_all).
 -compile(nowarn_export_all).
@@ -419,7 +419,7 @@ t_rest_clienit_info(_) ->
 %%
 %% TODO: Start/Stop, List Instace
 %%
-%% TODO: RateLimit, OOM, 
+%% TODO: RateLimit, OOM,
 
 with_connection(DoFun) ->
     {ok, Sock} = gen_tcp:connect({127, 0, 0, 1},
diff --git a/apps/emqx_gateway/test/props/emqx_sn_proper_types.erl b/apps/emqx_gateway/test/props/emqx_sn_proper_types.erl
index 95cfc6d20..93d7de05e 100644
--- a/apps/emqx_gateway/test/props/emqx_sn_proper_types.erl
+++ b/apps/emqx_gateway/test/props/emqx_sn_proper_types.erl
@@ -16,7 +16,7 @@
 
 -module(emqx_sn_proper_types).
 
--include_lib("emqx_gateway/src/mqttsn/include/emqx_sn.hrl").
+-include("emqx_sn.hrl").
 -include_lib("proper/include/proper.hrl").
 
 -compile({no_auto_import, [register/1]}).