diff --git a/src/protocol/meson.build b/src/protocol/meson.build
index 5060de51..9479a9c0 100644
--- a/src/protocol/meson.build
+++ b/src/protocol/meson.build
@@ -33,3 +33,5 @@ if conf_data.get('CONFIG_DATA')
 	srcs += files('data.c')
 endif
 srcs += files('about.c', 'common.c', 'date.c', 'header.c', 'protocol.cpp', 'proxy.c', 'uri.c', 'user.c')
+
+subdir('test')
diff --git a/src/protocol/test/meson.build b/src/protocol/test/meson.build
new file mode 100644
index 00000000..e269269e
--- /dev/null
+++ b/src/protocol/test/meson.build
@@ -0,0 +1,25 @@
+idna_dep = dependency('libidn')
+executable('uri-test', 'uri-test.c', 'stub.c', meson.current_source_dir()+'/../protocol.cpp', meson.current_source_dir()+'/../uri.c',
+meson.source_root()+'/src/intl/gettext/bindtextdom.c',
+meson.source_root()+'/src/intl/gettext/dcgettext.c',
+meson.source_root()+'/src/intl/gettext/dcigettext.c',
+meson.source_root()+'/src/intl/gettext/dcngettext.c',
+meson.source_root()+'/src/intl/gettext/dgettext.c',
+meson.source_root()+'/src/intl/gettext/dngettext.c',
+meson.source_root()+'/src/intl/gettext/explodename.c',
+meson.source_root()+'/src/intl/gettext/finddomain.c',
+meson.source_root()+'/src/intl/gettext/gettext.c',
+meson.source_root()+'/src/intl/gettext/intl-compat.c',
+meson.source_root()+'/src/intl/gettext/l10nflist.c',
+meson.source_root()+'/src/intl/gettext/libintl.c',
+meson.source_root()+'/src/intl/gettext/loadmsgcat.c',
+meson.source_root()+'/src/intl/gettext/localcharset.c',
+meson.source_root()+'/src/intl/gettext/localealias.c',
+meson.source_root()+'/src/intl/gettext/ngettext.c',
+meson.source_root()+'/src/intl/gettext/plural.c',
+meson.source_root()+'/src/intl/gettext/textdomain.c',
+testdeps, dependencies: [idna_dep],
+c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'],  include_directories:['.', '..', '../..', '../../..', '../../../..'])
+t = find_program('test-normalize-uri')
+test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'})
+test('normalize-uri', t, env: test_lib, workdir: meson.current_build_dir())
diff --git a/src/protocol/test/stub.c b/src/protocol/test/stub.c
index 2d36d98f..f0869219 100644
--- a/src/protocol/test/stub.c
+++ b/src/protocol/test/stub.c
@@ -51,6 +51,7 @@ STUB_MODULE(file_protocol_module);
 STUB_MODULE(finger_protocol_module);
 STUB_MODULE(fsp_protocol_module);
 STUB_MODULE(ftp_protocol_module);
+STUB_MODULE(gemini_protocol_module);
 STUB_MODULE(gopher_protocol_module);
 STUB_MODULE(http_protocol_module);
 STUB_MODULE(nntp_protocol_module);
@@ -87,6 +88,7 @@ STUB_PROTOCOL_HANDLER(file_protocol_handler);
 STUB_PROTOCOL_HANDLER(finger_protocol_handler);
 STUB_PROTOCOL_HANDLER(fsp_protocol_handler);
 STUB_PROTOCOL_HANDLER(ftp_protocol_handler);
+STUB_PROTOCOL_HANDLER(gemini_protocol_handler);
 STUB_PROTOCOL_HANDLER(gopher_protocol_handler);
 STUB_PROTOCOL_HANDLER(http_protocol_handler);
 STUB_PROTOCOL_HANDLER(news_protocol_handler);