diff --git a/.circleci/config.yml b/.circleci/config.yml
index 30d7f9fe9..f5635a3bb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,11 +48,12 @@ jobs:
       - image: ubuntu:19.10
     steps:
       - checkout
-      - run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip
+      - run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip meson
       - run: pip install fonttools
       - run: ./autogen.sh
       - run: make -j32
       - run: make distcheck || .ci/fail.sh
+      - run: rm harfbuzz-* && make distdir && cd harfbuzz-* && meson build && ninja -Cbuild test
 
   alpine-O3-Os-NOMMAP:
     docker:
diff --git a/Makefile.am b/Makefile.am
index 6689439df..835bc193d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,9 @@ EXTRA_DIST = \
 	RELEASING.md \
 	TESTING.md \
 	meson.build \
+	meson_options.txt \
+	meson-cc-tests/intel-atomic-primitives-test.c \
+	meson-cc-tests/solaris-atomic-operations.c \
 	replace-enum-strings.cmake \
 	mingw-configure.sh \
 	mingw-ldd.py \
diff --git a/src/Makefile.am b/src/Makefile.am
index d7c7cb2b5..b63bbe117 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ TESTS =
 check_PROGRAMS =
 
 EXTRA_DIST += harfbuzz.cc
+EXTRA_DIST += meson.build
 
 # Convenience targets:
 lib: $(BUILT_SOURCES) libharfbuzz.la
diff --git a/util/Makefile.am b/util/Makefile.am
index 5298e7732..29f690948 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -6,6 +6,8 @@ CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 
+EXTRA_DIST += meson.build
+
 include Makefile.sources
 
 # Convenience targets: