diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index f1470b3e5..bfd68c401 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -639,7 +639,7 @@
  * current polarssl_strerror().
  *
  * For new code, it is recommended to use polarssl_strerror() instead and
- * disabled this.
+ * disable this.
  *
  * Disable if you run into name conflicts and want to really remove the
  * error_strerror()
diff --git a/include/polarssl/ecdh.h b/include/polarssl/ecdh.h
index 428275d71..525cade98 100644
--- a/include/polarssl/ecdh.h
+++ b/include/polarssl/ecdh.h
@@ -47,7 +47,7 @@ typedef enum
  */
 typedef struct
 {
-    ecp_group grp;      /*!<  ellipitic curve used                          */
+    ecp_group grp;      /*!<  elliptic curve used                           */
     mpi d;              /*!<  our secret value (private key)                */
     ecp_point Q;        /*!<  our public value (public key)                 */
     ecp_point Qp;       /*!<  peer's public value (public key)              */
diff --git a/include/polarssl/ecdsa.h b/include/polarssl/ecdsa.h
index 71e5a0c4d..d99a17a28 100644
--- a/include/polarssl/ecdsa.h
+++ b/include/polarssl/ecdsa.h
@@ -40,7 +40,7 @@
  */
 typedef struct
 {
-    ecp_group grp;      /*!<  ellipitic curve used          */
+    ecp_group grp;      /*!<  elliptic curve used           */
     mpi d;              /*!<  secret signature key          */
     ecp_point Q;        /*!<  public signature key          */
     mpi r;              /*!<  first integer from signature  */
diff --git a/tests/suites/test_suite_pkcs5.data b/tests/suites/test_suite_pkcs5.data
index c22ad0b6f..ccc08da6d 100644
--- a/tests/suites/test_suite_pkcs5.data
+++ b/tests/suites/test_suite_pkcs5.data
@@ -98,7 +98,7 @@ PBES2 Decrypt (bad enc_scheme_alg: overlong)
 depends_on:POLARSSL_SHA1_C:POLARSSL_DES_C
 pkcs5_pbes2:ASN1_CONSTRUCTED | ASN1_SEQUENCE:"301B06092A864886F70D01050C300E04082ED7F24A1D516DD7020208003001":"":"":POLARSSL_ERR_PKCS5_INVALID_FORMAT + POLARSSL_ERR_ASN1_OUT_OF_DATA:""
 
-PBES2 Decrypt (bad enc_scheme_alg: unkown oid)
+PBES2 Decrypt (bad enc_scheme_alg: unknown oid)
 depends_on:POLARSSL_SHA1_C:POLARSSL_DES_C
 pkcs5_pbes2:ASN1_CONSTRUCTED | ASN1_SEQUENCE:"301B06092A864886F70D01050C300E04082ED7F24A1D516DD702020800300A06082A864886F70D03FF":"":"":POLARSSL_ERR_PKCS5_FEATURE_UNAVAILABLE:""
 
diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data
index a22741e5f..0b5ab396d 100644
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@@ -1107,7 +1107,7 @@ x509_parse_rsassa_pss_params:"A00A300706052B0E03021A00":ASN1_CONSTRUCTED | ASN1_
 X509 RSASSA-PSS parameters ASN1 (HashAlg with parameters)
 x509_parse_rsassa_pss_params:"A00F300D06096086480165030402013000":ASN1_CONSTRUCTED | ASN1_SEQUENCE:POLARSSL_MD_SHA256:POLARSSL_MD_SHA1:20:POLARSSL_ERR_X509_INVALID_ALG + POLARSSL_ERR_ASN1_INVALID_DATA
 
-X509 RSASSA-PSS parameters ASN1 (HashAlg unkown OID)
+X509 RSASSA-PSS parameters ASN1 (HashAlg unknown OID)
 x509_parse_rsassa_pss_params:"A00D300B06096086480165030402FF":ASN1_CONSTRUCTED | ASN1_SEQUENCE:POLARSSL_MD_SHA256:POLARSSL_MD_SHA1:20:POLARSSL_ERR_X509_INVALID_ALG + POLARSSL_ERR_OID_NOT_FOUND
 
 X509 RSASSA-PSS parameters ASN1 (good, MGAlg = MGF1-SHA256)