diff --git a/.gitignore b/.gitignore
index f128c70a9..a9fcf4ef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,12 @@
 # Object files
 *.o
 
+# editor artefacts
+*.swp
+.#*
+#*#
+*~
+
 # Top level excludes
 /Makefile.bak
 /Makefile
@@ -19,6 +25,12 @@
 !/test/r160test.c
 !/test/fips_algvs.c
 
+/test/*.ss
+/test/*.srl
+/test/.rnd
+/test/test*.pem
+/test/newkey.pem
+
 # Certificate symbolic links
 *.0