diff --git a/test/Makefile.am b/test/Makefile.am
index 4aab72dc..559513f2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,38 +2,38 @@
 EXTRA_DIST = \
 	cmptest.h \
 	windows/windows-quirks.h \
-	auth.out \
-	auth2.out \
-	auth3.out \
-	auth5.out \
-	box.out \
-	box2.out \
-	box7.out \
-	box8.out \
-	core1.out \
-	core2.out \
-	core3.out \
-	core4.out \
-	core5.out \
-	core6.out \
-	hash.out \
-	hash2.out \
-	hash3.out \
-	onetimeauth.out \
-	onetimeauth2.out \
-	onetimeauth7.out \
-	scalarmult.out \
-	scalarmult2.out \
-	scalarmult5.out \
-	scalarmult6.out \
-	secretbox.out \
-	secretbox2.out \
-	secretbox7.out \
-	secretbox8.out \
-	stream.out \
-	stream2.out \
-	stream3.out \
-	stream4.out
+	auth.expected \
+	auth2.expected \
+	auth3.expected \
+	auth5.expected \
+	box.expected \
+	box2.expected \
+	box7.expected \
+	box8.expected \
+	core1.expected \
+	core2.expected \
+	core3.expected \
+	core4.expected \
+	core5.expected \
+	core6.expected \
+	hash.expected \
+	hash2.expected \
+	hash3.expected \
+	onetimeauth.expected \
+	onetimeauth2.expected \
+	onetimeauth7.expected \
+	scalarmult.expected \
+	scalarmult2.expected \
+	scalarmult5.expected \
+	scalarmult6.expected \
+	secretbox.expected \
+	secretbox2.expected \
+	secretbox7.expected \
+	secretbox8.expected \
+	stream.expected \
+	stream2.expected \
+	stream3.expected \
+	stream4.expected
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libsodium/include \
diff --git a/test/auth.out b/test/auth.exp
similarity index 100%
rename from test/auth.out
rename to test/auth.exp
diff --git a/test/auth2.out b/test/auth2.exp
similarity index 100%
rename from test/auth2.out
rename to test/auth2.exp
diff --git a/test/auth3.out b/test/auth3.exp
similarity index 100%
rename from test/auth3.out
rename to test/auth3.exp
diff --git a/test/auth5.out b/test/auth5.exp
similarity index 100%
rename from test/auth5.out
rename to test/auth5.exp
diff --git a/test/box.out b/test/box.exp
similarity index 100%
rename from test/box.out
rename to test/box.exp
diff --git a/test/box2.out b/test/box2.exp
similarity index 100%
rename from test/box2.out
rename to test/box2.exp
diff --git a/test/box7.out b/test/box7.exp
similarity index 100%
rename from test/box7.out
rename to test/box7.exp
diff --git a/test/box8.out b/test/box8.exp
similarity index 100%
rename from test/box8.out
rename to test/box8.exp
diff --git a/test/cmptest.h b/test/cmptest.h
index 177572a4..00f858d0 100644
--- a/test/cmptest.h
+++ b/test/cmptest.h
@@ -5,7 +5,7 @@
 #include <stdio.h>
 
 #define TEST_NAME_RES TEST_NAME ".res"
-#define TEST_NAME_OUT TEST_NAME ".out"
+#define TEST_NAME_OUT TEST_NAME ".exp"
 
 FILE *fp_res;
 int   xmain(void);
diff --git a/test/core1.out b/test/core1.exp
similarity index 100%
rename from test/core1.out
rename to test/core1.exp
diff --git a/test/core2.out b/test/core2.exp
similarity index 100%
rename from test/core2.out
rename to test/core2.exp
diff --git a/test/core3.out b/test/core3.exp
similarity index 100%
rename from test/core3.out
rename to test/core3.exp
diff --git a/test/core4.out b/test/core4.exp
similarity index 100%
rename from test/core4.out
rename to test/core4.exp
diff --git a/test/core5.out b/test/core5.exp
similarity index 100%
rename from test/core5.out
rename to test/core5.exp
diff --git a/test/core6.out b/test/core6.exp
similarity index 100%
rename from test/core6.out
rename to test/core6.exp
diff --git a/test/hash.out b/test/hash.exp
similarity index 100%
rename from test/hash.out
rename to test/hash.exp
diff --git a/test/hash2.out b/test/hash2.exp
similarity index 100%
rename from test/hash2.out
rename to test/hash2.exp
diff --git a/test/hash3.out b/test/hash3.exp
similarity index 100%
rename from test/hash3.out
rename to test/hash3.exp
diff --git a/test/onetimeauth.out b/test/onetimeauth.exp
similarity index 100%
rename from test/onetimeauth.out
rename to test/onetimeauth.exp
diff --git a/test/onetimeauth2.out b/test/onetimeauth2.exp
similarity index 100%
rename from test/onetimeauth2.out
rename to test/onetimeauth2.exp
diff --git a/test/onetimeauth7.out b/test/onetimeauth7.exp
similarity index 100%
rename from test/onetimeauth7.out
rename to test/onetimeauth7.exp
diff --git a/test/scalarmult.out b/test/scalarmult.exp
similarity index 100%
rename from test/scalarmult.out
rename to test/scalarmult.exp
diff --git a/test/scalarmult2.out b/test/scalarmult2.exp
similarity index 100%
rename from test/scalarmult2.out
rename to test/scalarmult2.exp
diff --git a/test/scalarmult5.out b/test/scalarmult5.exp
similarity index 100%
rename from test/scalarmult5.out
rename to test/scalarmult5.exp
diff --git a/test/scalarmult6.out b/test/scalarmult6.exp
similarity index 100%
rename from test/scalarmult6.out
rename to test/scalarmult6.exp
diff --git a/test/secretbox.out b/test/secretbox.exp
similarity index 100%
rename from test/secretbox.out
rename to test/secretbox.exp
diff --git a/test/secretbox2.out b/test/secretbox2.exp
similarity index 100%
rename from test/secretbox2.out
rename to test/secretbox2.exp
diff --git a/test/secretbox7.out b/test/secretbox7.exp
similarity index 100%
rename from test/secretbox7.out
rename to test/secretbox7.exp
diff --git a/test/secretbox8.out b/test/secretbox8.exp
similarity index 100%
rename from test/secretbox8.out
rename to test/secretbox8.exp
diff --git a/test/stream.out b/test/stream.exp
similarity index 100%
rename from test/stream.out
rename to test/stream.exp
diff --git a/test/stream2.out b/test/stream2.exp
similarity index 100%
rename from test/stream2.out
rename to test/stream2.exp
diff --git a/test/stream3.out b/test/stream3.exp
similarity index 100%
rename from test/stream3.out
rename to test/stream3.exp
diff --git a/test/stream4.out b/test/stream4.exp
similarity index 100%
rename from test/stream4.out
rename to test/stream4.exp