diff --git a/tests/run_all_unittests.py b/test/run_all_unittests.py
similarity index 100%
rename from tests/run_all_unittests.py
rename to test/run_all_unittests.py
diff --git a/tests/run_readelf_tests.py b/test/run_readelf_tests.py
similarity index 95%
rename from tests/run_readelf_tests.py
rename to test/run_readelf_tests.py
index 61cfbee..3592f40 100755
--- a/tests/run_readelf_tests.py
+++ b/test/run_readelf_tests.py
@@ -180,7 +180,7 @@
     """ Check whether the current dir is the root dir of pyelftools
     """
     dirstuff = os.listdir('.')
-    return 'tests' in dirstuff and 'elftools' in dirstuff
+    return 'test' in dirstuff and 'elftools' in dirstuff
     
 
 def main():
@@ -193,7 +193,7 @@
     if len(sys.argv) > 1:
         filenames = sys.argv[1:]
     else:
-        filenames = list(discover_testfiles('tests/testfiles'))
+        filenames = list(discover_testfiles('test/testfiles'))
 
     success = True
     for filename in filenames:
@@ -206,11 +206,7 @@
 
 
 if __name__ == '__main__':
-    #import os
-    #os.chdir('..')
     main()
-    #testlog.info(list(discover_testfiles('tests/testfiles'))) 
-    #print run_exe('scripts/readelf.py', ['-h', 'tests/testfiles/z32.o.elf'])
 
 
 
diff --git a/tests/test_callframe.py b/test/test_callframe.py
similarity index 100%
rename from tests/test_callframe.py
rename to test/test_callframe.py
diff --git a/tests/test_dwarf_expr.py b/test/test_dwarf_expr.py
similarity index 100%
rename from tests/test_dwarf_expr.py
rename to test/test_dwarf_expr.py
diff --git a/tests/test_dwarf_lineprogram.py b/test/test_dwarf_lineprogram.py
similarity index 100%
rename from tests/test_dwarf_lineprogram.py
rename to test/test_dwarf_lineprogram.py
diff --git a/tests/test_dwarf_structs.py b/test/test_dwarf_structs.py
similarity index 100%
rename from tests/test_dwarf_structs.py
rename to test/test_dwarf_structs.py
diff --git a/tests/test_utils.py b/test/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to test/test_utils.py
diff --git a/tests/testfiles/exe_simple32.elf b/test/testfiles/exe_simple32.elf
similarity index 100%
rename from tests/testfiles/exe_simple32.elf
rename to test/testfiles/exe_simple32.elf
Binary files differ
diff --git a/tests/testfiles/exe_simple64.elf b/test/testfiles/exe_simple64.elf
similarity index 100%
rename from tests/testfiles/exe_simple64.elf
rename to test/testfiles/exe_simple64.elf
Binary files differ
diff --git a/tests/testfiles/exe_stripped64.elf b/test/testfiles/exe_stripped64.elf
similarity index 100%
rename from tests/testfiles/exe_stripped64.elf
rename to test/testfiles/exe_stripped64.elf
Binary files differ
diff --git a/tests/testfiles/libelf0_8_13_32bit.so.elf b/test/testfiles/libelf0_8_13_32bit.so.elf
similarity index 100%
rename from tests/testfiles/libelf0_8_13_32bit.so.elf
rename to test/testfiles/libelf0_8_13_32bit.so.elf
Binary files differ
diff --git a/tests/testfiles/obj_simple32.o.elf b/test/testfiles/obj_simple32.o.elf
similarity index 100%
rename from tests/testfiles/obj_simple32.o.elf
rename to test/testfiles/obj_simple32.o.elf
Binary files differ
diff --git a/tests/testfiles/penalty_32_gcc.o.elf b/test/testfiles/penalty_32_gcc.o.elf
similarity index 100%
rename from tests/testfiles/penalty_32_gcc.o.elf
rename to test/testfiles/penalty_32_gcc.o.elf
Binary files differ
diff --git a/tests/testfiles/penalty_64_clang.o.elf b/test/testfiles/penalty_64_clang.o.elf
similarity index 100%
rename from tests/testfiles/penalty_64_clang.o.elf
rename to test/testfiles/penalty_64_clang.o.elf
Binary files differ
diff --git a/tests/testfiles/penalty_64_gcc.o.elf b/test/testfiles/penalty_64_gcc.o.elf
similarity index 100%
rename from tests/testfiles/penalty_64_gcc.o.elf
rename to test/testfiles/penalty_64_gcc.o.elf
Binary files differ
diff --git a/tests/testfiles/update32.o.elf b/test/testfiles/update32.o.elf
similarity index 100%
rename from tests/testfiles/update32.o.elf
rename to test/testfiles/update32.o.elf
Binary files differ
diff --git a/tests/utils/Makefile b/test/utils/Makefile
similarity index 100%
rename from tests/utils/Makefile
rename to test/utils/Makefile
diff --git a/tests/utils/README.txt b/test/utils/README.txt
similarity index 100%
rename from tests/utils/README.txt
rename to test/utils/README.txt
diff --git a/tests/utils/elf_creator.c b/test/utils/elf_creator.c
similarity index 100%
rename from tests/utils/elf_creator.c
rename to test/utils/elf_creator.c