diff --git a/test.cpp b/test.cpp
index 8e6c0473..2f400eaa 100644
--- a/test.cpp
+++ b/test.cpp
@@ -881,27 +881,28 @@ bool Validate(int alg, bool thorough, const char *seedInput)
 	case 66: result = ValidateCamellia(); break;
 	case 67: result = ValidateWhirlpool(); break;
 	case 68: result = ValidateTTMAC(); break;
-	case 69: result = ValidateSalsa(); break;
-	case 70: result = ValidateSosemanuk(); break;
-	case 71: result = ValidateRabbit(); break;
-	case 72: result = ValidateHC128(); break;
-	case 73: result = ValidateHC256(); break;
-	case 74: result = ValidateVMAC(); break;
-	case 75: result = ValidateCCM(); break;
-	case 76: result = ValidateGCM(); break;
-	case 77: result = ValidateCMAC(); break;
-	case 78: result = ValidateSM3(); break;
-	case 79: result = ValidateBLAKE2s(); break;
-	case 80: result = ValidateBLAKE2b(); break;
-	case 81: result = ValidatePoly1305(); break;
-	case 82: result = ValidateSipHash(); break;
-	case 83: result = ValidateHashDRBG(); break;
-	case 84: result = ValidateHmacDRBG(); break;
-	case 85: result = ValidateNaCl(); break;
-	case 86: result = ValidateCHAM(); break;
-	case 87: result = ValidateSIMECK(); break;
-	case 88: result = ValidateSIMON(); break;
-	case 89: result = ValidateSPECK(); break;
+	case 70: result = ValidateSalsa(); break;
+	case 71: result = ValidateChaCha(); break;
+	case 72: result = ValidateSosemanuk(); break;
+	case 73: result = ValidateRabbit(); break;
+	case 74: result = ValidateHC128(); break;
+	case 75: result = ValidateHC256(); break;
+	case 80: result = ValidateVMAC(); break;
+	case 81: result = ValidateCCM(); break;
+	case 82: result = ValidateGCM(); break;
+	case 83: result = ValidateCMAC(); break;
+	case 84: result = ValidateSM3(); break;
+	case 85: result = ValidateBLAKE2s(); break;
+	case 86: result = ValidateBLAKE2b(); break;
+	case 87: result = ValidatePoly1305(); break;
+	case 88: result = ValidateSipHash(); break;
+	case 89: result = ValidateHashDRBG(); break;
+	case 90: result = ValidateHmacDRBG(); break;
+	case 91: result = ValidateNaCl(); break;
+	case 100: result = ValidateCHAM(); break;
+	case 101: result = ValidateSIMECK(); break;
+	case 102: result = ValidateSIMON(); break;
+	case 103: result = ValidateSPECK(); break;
 
 #if defined(CRYPTOPP_EXTENDED_VALIDATION)
 	// http://github.com/weidai11/cryptopp/issues/92
diff --git a/validat3.cpp b/validat3.cpp
index abcd1e55..94eb9d37 100644
--- a/validat3.cpp
+++ b/validat3.cpp
@@ -149,6 +149,7 @@ bool ValidateAll(bool thorough)
 	pass=ValidateSPECK() && pass;
 	pass=ValidateCamellia() && pass;
 	pass=ValidateSalsa() && pass;
+	pass=ValidateChaCha() && pass;
 	pass=ValidateSosemanuk() && pass;
 	pass=ValidateRabbit() && pass;
 	pass=ValidateHC128() && pass;
diff --git a/validat4.cpp b/validat4.cpp
index 624c3d12..8b384999 100644
--- a/validat4.cpp
+++ b/validat4.cpp
@@ -1736,6 +1736,13 @@ bool ValidateSalsa()
 	return RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/salsa.txt");
 }
 
+bool ValidateChaCha()
+{
+	std::cout << "\nChaCha validation suite running...\n";
+
+	return RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/chacha.txt");
+}
+
 bool ValidateSosemanuk()
 {
 	std::cout << "\nSosemanuk validation suite running...\n";
diff --git a/validate.h b/validate.h
index 5e029775..1e2beaf4 100644
--- a/validate.h
+++ b/validate.h
@@ -96,6 +96,7 @@ bool ValidateHC128();
 bool ValidateHC256();
 bool ValidateRabbit();
 bool ValidateSalsa();
+bool ValidateChaCha();
 bool ValidateSosemanuk();
 
 bool ValidateVMAC();