diff --git a/libsodium/.gitignore b/libsodium/.gitignore
index a3f8f91d..b8d17d28 100644
--- a/libsodium/.gitignore
+++ b/libsodium/.gitignore
@@ -45,6 +45,7 @@ src/curvecp/curvecpmessage
 src/curvecp/curvecpprintkey
 src/curvecp/curvecpserver
 src/libsodium/*.def
+src/libsodium/include/sodium/version.h
 stamp-*
 test/default/*.res
 test/default/*.trs
diff --git a/libsodium/Makefile.am b/libsodium/Makefile.am
index ee794b07..2d264ae6 100644
--- a/libsodium/Makefile.am
+++ b/libsodium/Makefile.am
@@ -12,8 +12,7 @@ EXTRA_DIST = \
 SUBDIRS = \
 	dist-build \
 	msvc-scripts \
-	src \
-	test
+	src
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = @PACKAGE_NAME@.pc
diff --git a/libsodium/Makefile.in b/libsodium/Makefile.in
index 4221f00e..f75bd481 100644
--- a/libsodium/Makefile.in
+++ b/libsodium/Makefile.in
@@ -315,8 +315,7 @@ EXTRA_DIST = \
 SUBDIRS = \
 	dist-build \
 	msvc-scripts \
-	src \
-	test
+	src
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = @PACKAGE_NAME@.pc
diff --git a/libsodium/configure b/libsodium/configure
index b3141bda..fddc4ee7 100755
--- a/libsodium/configure
+++ b/libsodium/configure
@@ -3126,7 +3126,7 @@ fi
 
 else
 
-  enable_minimal="no"
+  enable_minimal="yes"
 
 fi
 
@@ -14752,7 +14752,7 @@ if test "x$PKG_CONFIG" != "x"; then :
 
 
 fi
-ac_config_files="$ac_config_files Makefile dist-build/Makefile msvc-scripts/Makefile src/Makefile src/libsodium/Makefile src/libsodium/include/Makefile src/libsodium/include/sodium/version.h test/default/Makefile test/Makefile"
+ac_config_files="$ac_config_files Makefile dist-build/Makefile msvc-scripts/Makefile src/Makefile src/libsodium/Makefile src/libsodium/include/Makefile src/libsodium/include/sodium/version.h"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15801,8 +15801,6 @@ do
     "src/libsodium/Makefile") CONFIG_FILES="$CONFIG_FILES src/libsodium/Makefile" ;;
     "src/libsodium/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/libsodium/include/Makefile" ;;
     "src/libsodium/include/sodium/version.h") CONFIG_FILES="$CONFIG_FILES src/libsodium/include/sodium/version.h" ;;
-    "test/default/Makefile") CONFIG_FILES="$CONFIG_FILES test/default/Makefile" ;;
-    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/libsodium/configure.ac b/libsodium/configure.ac
index 6cac2944..6adb5ab8 100644
--- a/libsodium/configure.ac
+++ b/libsodium/configure.ac
@@ -96,7 +96,7 @@ AC_ARG_ENABLE(minimal,
   ])
 ],
 [
-  enable_minimal="no"
+  enable_minimal="yes"
 ])
 AM_CONDITIONAL([MINIMAL], [test x$enable_minimal = xyes])
 
@@ -436,7 +436,5 @@ AC_CONFIG_FILES([Makefile
                  src/libsodium/Makefile
                  src/libsodium/include/Makefile
                  src/libsodium/include/sodium/version.h
-                 test/default/Makefile
-                 test/Makefile
                  ])
 AC_OUTPUT