diff --git a/.gitignore b/.gitignore
index 2edbc997c1..ea732a4961 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,12 +30,13 @@ massif-*
 # Exported Mbed Crypto files
 crypto/LICENSE
 crypto/VERSION.txt
-crypto/include
+crypto/include/mbedcrypto/*.h
+crypto/include/psa/*.h
 crypto/library/*.c
-crypto/library/libmbedcrypto*
+crypto/programs/psa/*.c
+crypto/programs/psa/*.sh
 crypto/scripts
 crypto/tests/scripts
-crypto/tests/suites
-crypto/tests/test_suite*
-crypto/programs/psa
+crypto/tests/suites/*.data
+crypto/tests/suites/*.function
 mbedcrypto.tar.gz
diff --git a/crypto/.gitignore b/crypto/.gitignore
index bf39198d16..ae4ba45309 100644
--- a/crypto/.gitignore
+++ b/crypto/.gitignore
@@ -1,2 +1,13 @@
+*.exe
+*.o
+*.obj
 /docs/*.pdf
 /docs/html
+/library/libmbedcrypto*.a
+/library/libmbedcrypto*.dll
+/library/libmbedcrypto*.so
+/library/libmbedcrypto*.so.[0-9]*
+/programs/psa/crypto_examples
+/programs/psa/key_ladder_demo
+/programs/psa/psa_constant_names
+/tests/test_suite_*
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d8b74f227f..a7821d7bc8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -111,6 +111,7 @@ add_test_suite(pkparse)
 add_test_suite(pkwrite)
 add_test_suite(poly1305)
 add_test_suite(psa_crypto)
+add_test_suite(psa_crypto_metadata)
 add_test_suite(shax)
 add_test_suite(ssl)
 add_test_suite(timing)