diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 652d7459..bd9d6a74 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -3,6 +3,7 @@ lib_LTLIBRARIES = \
 
 libsodium_la_SOURCES = \
 	crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \
+	crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \
 	crypto_auth/crypto_auth.c \
 	crypto_auth/hmacsha256/auth_hmacsha256.c \
 	crypto_auth/hmacsha512/auth_hmacsha512.c \
@@ -154,7 +155,6 @@ endif
 
 if !MINIMAL
 libsodium_la_SOURCES += \
-	crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \
 	crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c \
 	crypto_core/hchacha20/core_hchacha20.c \
 	crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c \
diff --git a/test/default/Makefile.am b/test/default/Makefile.am
index e4d0da7e..577635ab 100644
--- a/test/default/Makefile.am
+++ b/test/default/Makefile.am
@@ -279,6 +279,7 @@ AM_LDFLAGS = @TEST_LDFLAGS@
 TESTS_TARGETS = \
 	aead_aes256gcm \
 	aead_chacha20poly1305 \
+	aead_xchacha20poly1305 \
 	auth \
 	auth2 \
 	auth3 \
@@ -546,7 +547,6 @@ xchacha20_LDADD           = $(TESTS_LDADD)
 
 if !MINIMAL
 TESTS_TARGETS += \
-	aead_xchacha20poly1305 \
 	siphashx24 \
 	xchacha20
 endif