diff --git a/tests/__init__.py b/Tests/ufoLib/__init__.py similarity index 100% rename from tests/__init__.py rename to Tests/ufoLib/__init__.py diff --git a/tests/testSupport.py b/Tests/ufoLib/testSupport.py similarity index 100% rename from tests/testSupport.py rename to Tests/ufoLib/testSupport.py diff --git a/tests/test_GLIF1.py b/Tests/ufoLib/test_GLIF1.py similarity index 100% rename from tests/test_GLIF1.py rename to Tests/ufoLib/test_GLIF1.py diff --git a/tests/test_GLIF2.py b/Tests/ufoLib/test_GLIF2.py similarity index 100% rename from tests/test_GLIF2.py rename to Tests/ufoLib/test_GLIF2.py diff --git a/tests/test_UFO1.py b/Tests/ufoLib/test_UFO1.py similarity index 100% rename from tests/test_UFO1.py rename to Tests/ufoLib/test_UFO1.py diff --git a/tests/test_UFO2.py b/Tests/ufoLib/test_UFO2.py similarity index 100% rename from tests/test_UFO2.py rename to Tests/ufoLib/test_UFO2.py diff --git a/tests/test_UFO3.py b/Tests/ufoLib/test_UFO3.py similarity index 100% rename from tests/test_UFO3.py rename to Tests/ufoLib/test_UFO3.py diff --git a/tests/test_UFOConversion.py b/Tests/ufoLib/test_UFOConversion.py similarity index 100% rename from tests/test_UFOConversion.py rename to Tests/ufoLib/test_UFOConversion.py diff --git a/tests/test_UFOZ.py b/Tests/ufoLib/test_UFOZ.py similarity index 100% rename from tests/test_UFOZ.py rename to Tests/ufoLib/test_UFOZ.py diff --git a/tests/test_etree.py b/Tests/ufoLib/test_etree.py similarity index 100% rename from tests/test_etree.py rename to Tests/ufoLib/test_etree.py diff --git a/tests/test_filenames.py b/Tests/ufoLib/test_filenames.py similarity index 100% rename from tests/test_filenames.py rename to Tests/ufoLib/test_filenames.py diff --git a/tests/test_glifLib.py b/Tests/ufoLib/test_glifLib.py similarity index 100% rename from tests/test_glifLib.py rename to Tests/ufoLib/test_glifLib.py diff --git a/tests/test_plistlib.py b/Tests/ufoLib/test_plistlib.py similarity index 100% rename from tests/test_plistlib.py rename to Tests/ufoLib/test_plistlib.py diff --git a/tests/testdata/DemoFont.ufo/fontinfo.plist b/Tests/ufoLib/testdata/DemoFont.ufo/fontinfo.plist similarity index 100% rename from tests/testdata/DemoFont.ufo/fontinfo.plist rename to Tests/ufoLib/testdata/DemoFont.ufo/fontinfo.plist diff --git a/tests/testdata/DemoFont.ufo/glyphs/A_.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/A_.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/A_.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/A_.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/B_.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/B_.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/B_.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/B_.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/F_.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/F_.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/F_.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/F_.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/F__A__B_.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/F__A__B_.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/F__A__B_.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/F__A__B_.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/G_.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/G_.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/G_.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/G_.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/O_.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/O_.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/O_.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/O_.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/R_.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/R_.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/R_.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/R_.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/a.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/a.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/a.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/a.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/contents.plist b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/contents.plist similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/contents.plist rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/contents.plist diff --git a/tests/testdata/DemoFont.ufo/glyphs/testglyph1.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/testglyph1.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/testglyph1.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/testglyph1.glif diff --git a/tests/testdata/DemoFont.ufo/glyphs/testglyph1.reversed.glif b/Tests/ufoLib/testdata/DemoFont.ufo/glyphs/testglyph1.reversed.glif similarity index 100% rename from tests/testdata/DemoFont.ufo/glyphs/testglyph1.reversed.glif rename to Tests/ufoLib/testdata/DemoFont.ufo/glyphs/testglyph1.reversed.glif diff --git a/tests/testdata/DemoFont.ufo/lib.plist b/Tests/ufoLib/testdata/DemoFont.ufo/lib.plist similarity index 100% rename from tests/testdata/DemoFont.ufo/lib.plist rename to Tests/ufoLib/testdata/DemoFont.ufo/lib.plist diff --git a/tests/testdata/DemoFont.ufo/metainfo.plist b/Tests/ufoLib/testdata/DemoFont.ufo/metainfo.plist similarity index 100% rename from tests/testdata/DemoFont.ufo/metainfo.plist rename to Tests/ufoLib/testdata/DemoFont.ufo/metainfo.plist diff --git a/tests/testdata/TestFont1 (UFO1).ufo/fontinfo.plist b/Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/fontinfo.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO1).ufo/fontinfo.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/fontinfo.plist diff --git a/tests/testdata/TestFont1 (UFO1).ufo/glyphs/A_.glif b/Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/glyphs/A_.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO1).ufo/glyphs/A_.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/glyphs/A_.glif diff --git a/tests/testdata/TestFont1 (UFO1).ufo/glyphs/B_.glif b/Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/glyphs/B_.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO1).ufo/glyphs/B_.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/glyphs/B_.glif diff --git a/tests/testdata/TestFont1 (UFO1).ufo/glyphs/contents.plist b/Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/glyphs/contents.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO1).ufo/glyphs/contents.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/glyphs/contents.plist diff --git a/tests/testdata/TestFont1 (UFO1).ufo/groups.plist b/Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/groups.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO1).ufo/groups.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/groups.plist diff --git a/tests/testdata/TestFont1 (UFO1).ufo/kerning.plist b/Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/kerning.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO1).ufo/kerning.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/kerning.plist diff --git a/tests/testdata/TestFont1 (UFO1).ufo/lib.plist b/Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/lib.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO1).ufo/lib.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/lib.plist diff --git a/tests/testdata/TestFont1 (UFO1).ufo/metainfo.plist b/Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/metainfo.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO1).ufo/metainfo.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO1).ufo/metainfo.plist diff --git a/tests/testdata/TestFont1 (UFO2).ufo/features.fea b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/features.fea similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/features.fea rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/features.fea diff --git a/tests/testdata/TestFont1 (UFO2).ufo/fontinfo.plist b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/fontinfo.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/fontinfo.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/fontinfo.plist diff --git a/tests/testdata/TestFont1 (UFO2).ufo/glyphs/A_.glif b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/glyphs/A_.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/glyphs/A_.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/glyphs/A_.glif diff --git a/tests/testdata/TestFont1 (UFO2).ufo/glyphs/B_.glif b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/glyphs/B_.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/glyphs/B_.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/glyphs/B_.glif diff --git a/tests/testdata/TestFont1 (UFO2).ufo/glyphs/contents.plist b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/glyphs/contents.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/glyphs/contents.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/glyphs/contents.plist diff --git a/tests/testdata/TestFont1 (UFO2).ufo/groups.plist b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/groups.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/groups.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/groups.plist diff --git a/tests/testdata/TestFont1 (UFO2).ufo/kerning.plist b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/kerning.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/kerning.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/kerning.plist diff --git a/tests/testdata/TestFont1 (UFO2).ufo/lib.plist b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/lib.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/lib.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/lib.plist diff --git a/tests/testdata/TestFont1 (UFO2).ufo/metainfo.plist b/Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/metainfo.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO2).ufo/metainfo.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO2).ufo/metainfo.plist diff --git a/tests/testdata/TestFont1 (UFO3).ufo/data/com.github.fonttools.ttx/CUST.ttx b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/data/com.github.fonttools.ttx/CUST.ttx similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/data/com.github.fonttools.ttx/CUST.ttx rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/data/com.github.fonttools.ttx/CUST.ttx diff --git a/tests/testdata/TestFont1 (UFO3).ufo/fontinfo.plist b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/fontinfo.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/fontinfo.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/fontinfo.plist diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/_notdef.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/_notdef.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/_notdef.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/_notdef.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/a.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/a.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/a.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/a.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/b.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/b.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/b.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/b.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/c.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/c.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/c.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/c.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/contents.plist b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/contents.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/contents.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/contents.plist diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/d.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/d.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/d.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/d.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/e.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/e.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/e.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/e.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/f.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/f.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/f.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/f.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/g.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/g.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/g.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/g.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/h.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/h.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/h.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/h.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/i.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/i.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/i.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/i.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/j.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/j.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/j.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/j.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/k.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/k.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/k.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/k.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/l.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/l.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/l.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/l.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/glyphs/space.glif b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/space.glif similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/glyphs/space.glif rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/glyphs/space.glif diff --git a/tests/testdata/TestFont1 (UFO3).ufo/kerning.plist b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/kerning.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/kerning.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/kerning.plist diff --git a/tests/testdata/TestFont1 (UFO3).ufo/layercontents.plist b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/layercontents.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/layercontents.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/layercontents.plist diff --git a/tests/testdata/TestFont1 (UFO3).ufo/lib.plist b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/lib.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/lib.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/lib.plist diff --git a/tests/testdata/TestFont1 (UFO3).ufo/metainfo.plist b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/metainfo.plist similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufo/metainfo.plist rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufo/metainfo.plist diff --git a/tests/testdata/TestFont1 (UFO3).ufoz b/Tests/ufoLib/testdata/TestFont1 (UFO3).ufoz similarity index 100% rename from tests/testdata/TestFont1 (UFO3).ufoz rename to Tests/ufoLib/testdata/TestFont1 (UFO3).ufoz diff --git a/tests/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.directory/bar/lol.txt b/Tests/ufoLib/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.directory/bar/lol.txt similarity index 100% rename from tests/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.directory/bar/lol.txt rename to Tests/ufoLib/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.directory/bar/lol.txt diff --git a/tests/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.directory/foo.txt b/Tests/ufoLib/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.directory/foo.txt similarity index 100% rename from tests/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.directory/foo.txt rename to Tests/ufoLib/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.directory/foo.txt diff --git a/tests/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.file.txt b/Tests/ufoLib/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.file.txt similarity index 100% rename from tests/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.file.txt rename to Tests/ufoLib/testdata/UFO3-Read Data.ufo/data/org.unifiedfontobject.file.txt diff --git a/tests/testdata/UFO3-Read Data.ufo/metainfo.plist b/Tests/ufoLib/testdata/UFO3-Read Data.ufo/metainfo.plist similarity index 100% rename from tests/testdata/UFO3-Read Data.ufo/metainfo.plist rename to Tests/ufoLib/testdata/UFO3-Read Data.ufo/metainfo.plist diff --git a/tests/testdata/test.plist b/Tests/ufoLib/testdata/test.plist similarity index 100% rename from tests/testdata/test.plist rename to Tests/ufoLib/testdata/test.plist