diff --git a/Dockerfile b/Dockerfile
index 3cd3b38..2e3fb35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN apk add \
         krb5-dev \
         krb5-server \
         libedit-dev \
+        icu-dev \
         libxml2-dev \
         libxslt-dev \
         linux-headers \
diff --git a/autoconf.conf b/autoconf.conf
index 3a19aaa..b16f861 100644
--- a/autoconf.conf
+++ b/autoconf.conf
@@ -7,6 +7,7 @@ $PGBuild::conf{make_jobs} = 2;
 
 push(@{$PGBuild::conf{config_opts}}, (
 	'--enable-tap-tests',
+	'--with-icu',
 	'--with-pam',
 	'--with-ssl=openssl',
 	'--with-uuid=ossp'
@@ -18,9 +19,4 @@ push(@{$PGBuild::conf{config_opts}}, (
 # ld: src/port/strerror.c:72:(.text+0x2d8): undefined reference to `libintl_gettext'
 push(@{$PGBuild::conf{config_opts}}, "--disable-nls");
 
-# TODO: Currently failing two tests:
-# initdb/001_initdb
-# icu / icu/010_database
-push(@{$PGBuild::conf{config_opts}}, "--without-icu");
-
 1;
diff --git a/meson.conf b/meson.conf
index 15ec4c4..a95aa88 100644
--- a/meson.conf
+++ b/meson.conf
@@ -7,6 +7,7 @@ $PGBuild::conf{using_meson} = true;
 $PGBuild::conf{meson_jobs} = 2;
 
 push(@{$PGBuild::conf{meson_opts}}, (
+	'-Dicu=enabled',
 	'-Dlz4=enabled',
 	'-Dpam=enabled',
 	'-Dtap_tests=enabled',
@@ -23,9 +24,4 @@ push(@{$PGBuild::conf{meson_opts}}, '-Dlibedit_preferred=true');
 # ld: src/port/strerror.c:72:(.text+0x2d8): undefined reference to `libintl_gettext'
 push(@{$PGBuild::conf{meson_opts}}, '-Dnls=disabled');
 
-# TODO: Currently failing two tests:
-# initdb/001_initdb
-# icu / icu/010_database
-push(@{$PGBuild::conf{meson_opts}}, '-Dicu=disabled');
-
 1;