diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 8f4eb4e7cf..8c25de5114 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/build/modmake.rulesam
 
-bin_PROGRAMS = switch_event switch_hash switch_ivr_originate
+bin_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils
 AM_LDFLAGS  = -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) $(openssl_LIBS)
 AM_LDFLAGS += $(FREESWITCH_LIBS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
 AM_CFLAGS   = $(SWITCH_AM_CPPFLAGS)
diff --git a/tests/unit/switch_utils.c b/tests/unit/switch_utils.c
new file mode 100644
index 0000000000..177d14c6ba
--- /dev/null
+++ b/tests/unit/switch_utils.c
@@ -0,0 +1,79 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2018, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Seven Du <seven@signalwire.com>
+ *
+ *
+ * switch_utils.c -- tests switch_utils
+ *
+ */
+
+#include <stdio.h>
+#include <switch.h>
+#include <test/switch_test.h>
+
+FST_MINCORE_BEGIN()
+
+FST_SUITE_BEGIN(switch_hash)
+
+FST_SETUP_BEGIN()
+{
+}
+FST_SETUP_END()
+
+FST_TEARDOWN_BEGIN()
+{
+}
+FST_TEARDOWN_END()
+
+FST_TEST_BEGIN(benchmark)
+{
+    char encoded[1024];
+    char *s = "ABCD";
+
+    switch_url_encode(s, encoded, sizeof(encoded));
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "encoded: [%s]\n", encoded);
+    fst_check_string_equals(encoded, "ABCD");
+
+    s = "&bryän#!杜金房";
+    switch_url_encode(s, encoded, sizeof(encoded));
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "encoded: [%s]\n", encoded);
+    fst_check_string_equals(encoded, "%26bry%C3%A4n%23!%E6%9D%9C%E9%87%91%E6%88%BF");
+}
+FST_TEST_END()
+
+FST_SUITE_END()
+
+FST_MINCORE_END()
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */