diff --git a/src/emqttd_guid.erl b/src/emqttd_guid.erl
index c50294c65..ca2a85093 100644
--- a/src/emqttd_guid.erl
+++ b/src/emqttd_guid.erl
@@ -35,6 +35,10 @@
 
 -type guid() :: <<_:128>>.
 
+-ifdef(TEST).
+-compile(export_all).
+-endif.
+
 %% @doc Generate a global unique id.
 -spec gen() -> guid().
 gen() ->
diff --git a/src/emqttd_packet.erl b/src/emqttd_packet.erl
index cb93d5565..0fdbdc545 100644
--- a/src/emqttd_packet.erl
+++ b/src/emqttd_packet.erl
@@ -26,9 +26,13 @@
 
 -export([format/1]).
 
+-ifdef(TEST).
+-compile(export_all).
+-endif.
+
 %% @doc Protocol name of version
--spec protocol_name(mqtt_vsn()) -> binary(). 
-protocol_name(Ver) when Ver =:= ?MQTT_PROTO_V31; Ver =:= ?MQTT_PROTO_V311->
+-spec protocol_name(mqtt_vsn()) -> binary().
+protocol_name(Ver) when Ver =:= ?MQTT_PROTO_V31; Ver =:= ?MQTT_PROTO_V311 ->
     proplists:get_value(Ver, ?PROTOCOL_NAMES).
 
 %% @doc Name of MQTT packet type
@@ -38,12 +42,12 @@ type_name(Type) when Type > ?RESERVED andalso Type =< ?DISCONNECT ->
 
 %% @doc Connack Name
 -spec connack_name(mqtt_connack()) -> atom().
-connack_name(?CONNACK_ACCEPT)       -> 'CONNACK_ACCEPT';
-connack_name(?CONNACK_PROTO_VER)    -> 'CONNACK_PROTO_VER';
-connack_name(?CONNACK_INVALID_ID )  -> 'CONNACK_INVALID_ID';
-connack_name(?CONNACK_SERVER)       -> 'CONNACK_SERVER';
-connack_name(?CONNACK_CREDENTIALS)  -> 'CONNACK_CREDENTIALS';
-connack_name(?CONNACK_AUTH)         -> 'CONNACK_AUTH'.
+connack_name(?CONNACK_ACCEPT)      -> 'CONNACK_ACCEPT';
+connack_name(?CONNACK_PROTO_VER)   -> 'CONNACK_PROTO_VER';
+connack_name(?CONNACK_INVALID_ID)  -> 'CONNACK_INVALID_ID';
+connack_name(?CONNACK_SERVER)      -> 'CONNACK_SERVER';
+connack_name(?CONNACK_CREDENTIALS) -> 'CONNACK_CREDENTIALS';
+connack_name(?CONNACK_AUTH)        -> 'CONNACK_AUTH'.
 
 %% @doc Format packet
 -spec format(mqtt_packet()) -> iolist().
diff --git a/src/emqttd_pubsub_sup.erl b/src/emqttd_pubsub_sup.erl
index 532f3c2a0..a0cf50749 100644
--- a/src/emqttd_pubsub_sup.erl
+++ b/src/emqttd_pubsub_sup.erl
@@ -31,6 +31,10 @@
 %% Supervisor callbacks
 -export([init/1]).
 
+-ifdef(TEST).
+-compile(export_all).
+-endif.
+
 start_link() ->
     supervisor:start_link({local, ?MODULE}, ?MODULE, [emqttd_broker:env(pubsub)]).
 
diff --git a/test/emqttd_guid_tests.erl b/test/emqttd_guid_tests.erl
index a53f73959..224ed1925 100644
--- a/test/emqttd_guid_tests.erl
+++ b/test/emqttd_guid_tests.erl
@@ -25,7 +25,6 @@ gen_test() ->
     Guid2 = emqttd_guid:gen(),
     ?assertMatch(<<_:128>>, Guid1),
     ?assertEqual(true, Guid2 >= Guid1),
-    emqttd_guid:ts(r17),
     {Ts, _, 0} = Tup = emqttd_guid:new(),
     ?assertEqual(Ts, emqttd_guid:timestamp(emqttd_guid:bin(Tup))).