diff --git a/.gitignore b/.gitignore
index c28db49b..3315e98d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,7 +148,7 @@ test/default/secretbox7
 test/default/secretbox8
 test/default/secretbox_easy
 test/default/secretbox_easy2
-test/default/secretstream
+test/default/secretstream_xchacha20poly1305
 test/default/shorthash
 test/default/sign
 test/default/siphashx24
diff --git a/test/default/Makefile.am b/test/default/Makefile.am
index d36bd726..4d32c1ca 100644
--- a/test/default/Makefile.am
+++ b/test/default/Makefile.am
@@ -68,7 +68,7 @@ EXTRA_DIST = \
 	secretbox8.exp \
 	secretbox_easy.exp \
 	secretbox_easy2.exp \
-	secretstream.exp \
+	secretstream_xchacha20poly1305.exp \
 	shorthash.exp \
 	sign.exp \
 	siphashx24.exp \
@@ -149,7 +149,7 @@ DISTCLEANFILES = \
 	secretbox8.res \
 	secretbox_easy.res \
 	secretbox_easy2.res \
-	secretstream.res \
+	secretstream_xchacha20poly1305.res \
 	shorthash.res \
 	sign.res \
 	siphashx24.res \
@@ -233,7 +233,7 @@ TESTS_TARGETS = \
 	secretbox8 \
 	secretbox_easy \
 	secretbox_easy2 \
-	secretstream \
+	secretstream_xchacha20poly1305 \
 	shorthash \
 	sign \
 	sodium_core \
@@ -447,8 +447,8 @@ secretbox_easy_LDADD      = $(TESTS_LDADD)
 secretbox_easy2_SOURCE    = cmptest.h secretbox_easy2.c
 secretbox_easy2_LDADD     = $(TESTS_LDADD)
 
-secretstream_SOURCE       = cmptest.h secretstream.c
-secretstream_LDADD        = $(TESTS_LDADD)
+secretstream_xchacha20poly1305_SOURCE = cmptest.h secretstream_xchacha20poly1305.c
+secretstream_xchacha20poly1305_LDADD  = $(TESTS_LDADD)
 
 shorthash_SOURCE          = cmptest.h shorthash.c
 shorthash_LDADD           = $(TESTS_LDADD)
diff --git a/test/default/secretstream.c b/test/default/secretstream_xchacha20poly1305.c
similarity index 99%
rename from test/default/secretstream.c
rename to test/default/secretstream_xchacha20poly1305.c
index 63c64438..6955f82f 100644
--- a/test/default/secretstream.c
+++ b/test/default/secretstream_xchacha20poly1305.c
@@ -1,5 +1,5 @@
 
-#define TEST_NAME "secretstream"
+#define TEST_NAME "secretstream_xchacha20poly1305"
 #include "cmptest.h"
 
 int
diff --git a/test/default/secretstream.exp b/test/default/secretstream_xchacha20poly1305.exp
similarity index 100%
rename from test/default/secretstream.exp
rename to test/default/secretstream_xchacha20poly1305.exp