diff --git a/.gitignore b/.gitignore
index 94dda61..15152b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 doc/
+src/match
+tests/testMatch
+tests/testParser
+
 .config
 ~$*
 .DS_Store
@@ -17,7 +21,3 @@ doc/
 *bak
 *diff
 *orig
-src/match
-src/tests/parser/testParser
-src/tests/testMatch
-src/tests/testParser
diff --git a/src/tests/CMakeLists.txt b/tests/CMakeLists.txt
similarity index 100%
rename from src/tests/CMakeLists.txt
rename to tests/CMakeLists.txt
diff --git a/src/tests/Makefile b/tests/Makefile
similarity index 80%
rename from src/tests/Makefile
rename to tests/Makefile
index 830b478..a9c8fe2 100644
--- a/src/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-I../../include -DDEBUG -g -O0 -Wall
+CFLAGS=-I../include -DDEBUG -g -O0 -Wall
 LDFLAGS=-L..
 LOADLIBES=-lpsyc
 TARGETS=testParser testMatch
diff --git a/src/tests/packets/binary.txt b/tests/packets/binary.txt
similarity index 100%
rename from src/tests/packets/binary.txt
rename to tests/packets/binary.txt
diff --git a/src/tests/packets/enter_leave_context.txt b/tests/packets/enter_leave_context.txt
similarity index 100%
rename from src/tests/packets/enter_leave_context.txt
rename to tests/packets/enter_leave_context.txt
diff --git a/src/tests/packets/fake_dns.txt b/tests/packets/fake_dns.txt
similarity index 100%
rename from src/tests/packets/fake_dns.txt
rename to tests/packets/fake_dns.txt
diff --git a/src/tests/packets/invalid_dns.txt b/tests/packets/invalid_dns.txt
similarity index 100%
rename from src/tests/packets/invalid_dns.txt
rename to tests/packets/invalid_dns.txt
diff --git a/src/tests/packets/test-0-no-content b/tests/packets/test-0-no-content
similarity index 100%
rename from src/tests/packets/test-0-no-content
rename to tests/packets/test-0-no-content
diff --git a/src/tests/packets/test-1 b/tests/packets/test-1
similarity index 100%
rename from src/tests/packets/test-1
rename to tests/packets/test-1
diff --git a/src/tests/packets/test-1-length b/tests/packets/test-1-length
similarity index 100%
rename from src/tests/packets/test-1-length
rename to tests/packets/test-1-length
diff --git a/src/tests/packets/test-1-length-error b/tests/packets/test-1-length-error
similarity index 100%
rename from src/tests/packets/test-1-length-error
rename to tests/packets/test-1-length-error
diff --git a/src/tests/packets/test-1-utf8 b/tests/packets/test-1-utf8
similarity index 100%
rename from src/tests/packets/test-1-utf8
rename to tests/packets/test-1-utf8
diff --git a/src/tests/packets/test-2-list b/tests/packets/test-2-list
similarity index 100%
rename from src/tests/packets/test-2-list
rename to tests/packets/test-2-list
diff --git a/src/tests/packets/test-2-list-error b/tests/packets/test-2-list-error
similarity index 100%
rename from src/tests/packets/test-2-list-error
rename to tests/packets/test-2-list-error
diff --git a/src/tests/packets/test-3-list b/tests/packets/test-3-list
similarity index 100%
rename from src/tests/packets/test-3-list
rename to tests/packets/test-3-list
diff --git a/src/tests/packets/test-4-circuit b/tests/packets/test-4-circuit
similarity index 100%
rename from src/tests/packets/test-4-circuit
rename to tests/packets/test-4-circuit
diff --git a/src/tests/packets/test-4-circuit-n b/tests/packets/test-4-circuit-n
similarity index 100%
rename from src/tests/packets/test-4-circuit-n
rename to tests/packets/test-4-circuit-n
diff --git a/src/tests/packets/test-5-message-private b/tests/packets/test-5-message-private
similarity index 100%
rename from src/tests/packets/test-5-message-private
rename to tests/packets/test-5-message-private
diff --git a/src/tests/packets/test-6-message-private-remote b/tests/packets/test-6-message-private-remote
similarity index 100%
rename from src/tests/packets/test-6-message-private-remote
rename to tests/packets/test-6-message-private-remote
diff --git a/src/tests/testMatch.c b/tests/testMatch.c
similarity index 100%
rename from src/tests/testMatch.c
rename to tests/testMatch.c
diff --git a/src/tests/testParser.c b/tests/testParser.c
similarity index 100%
rename from src/tests/testParser.c
rename to tests/testParser.c