diff --git a/testsuite/serpent-test.c b/testsuite/serpent-test.c
index b1101ea3edd26f6802f0c0733cf412a58dbfe3f6..8c39632b394459c8500a03f88dee9dc0d284b85e 100644
--- a/testsuite/serpent-test.c
+++ b/testsuite/serpent-test.c
@@ -52,6 +52,51 @@ test_main(void)
 		 "0000000000000000 0000000000000000"),
 	      HL("8000000000000000 0000000000000000"),
 	      H("DA5A7992B1B4AE6F 8C004BC8A7DE5520"));
+#if 0
+  /* Test vectors from
+     http://www.cs.technion.ac.il/~biham/Reports/Serpent/ */
+
+  /* serpent128 */
+  /* Set 4, vector#  0 */
+  test_cipher(&nettle_serpent128,
+	      HL("000102030405060708090A0B0C0D0E0F"),
+	      HL("00112233445566778899AABBCCDDEEFF"),
+	      H("563E2CF8740A27C164804560391E9B27"));
+
+  /* Set 4, vector#  1 */
+  test_cipher(&nettle_serpent128,
+	      HL("2BD6459F82C5B300952C49104881FF48"),
+	      HL("EA024714AD5C4D84EA024714AD5C4D84"),
+	      H("92D7F8EF2C36C53409F275902F06539F"));
+
+  /* serpent192 */
+  /* Set 4, vector#  0 */
+  test_cipher(&nettle_serpent192,
+	      HL("000102030405060708090A0B0C0D0E0F1011121314151617"),
+	      HL("00112233445566778899AABBCCDDEEFF"),
+	      H("6AB816C82DE53B93005008AFA2246A02"));
+
+  /* Set 4, vector#  1 */
+  test_cipher(&nettle_serpent192,
+	      HL("2BD6459F82C5B300952C49104881FF482BD6459F82C5B300"),
+	      HL("EA024714AD5C4D84EA024714AD5C4D84"),
+	      H("827B18C2678A239DFC5512842000E204"));
+
+  /* serpent256 */
+  /* Set 4, vector#  0 */
+  test_cipher(&nettle_serpent256,
+	      HL("000102030405060708090A0B0C0D0E0F"
+		 "101112131415161718191A1B1C1D1E1F"),
+	      HL("00112233445566778899AABBCCDDEEFF"),
+	      H("2868B7A2D28ECD5E4FDEFAC3C4330074"));
+
+  /* Set 4, vector#  1 */
+    test_cipher(&nettle_serpent256,
+		HL("2BD6459F82C5B300952C49104881FF48"
+		   "2BD6459F82C5B300952C49104881FF48"),
+		HL("EA024714AD5C4D84EA024714AD5C4D84"),
+		H("3E507730776B93FDEA661235E1DD99F0"));
+#endif
 
   SUCCESS();
 }