diff --git a/.travis.yml b/.travis.yml
index 54d5a17..2caa1ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ before_install:
   - cabal install alex happy
 
 script:
-  - cabal configure && cabal build && ./test.sh
+  - cabal configure && cabal build && test/run
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000..72d5abd
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1 @@
+*.mid
diff --git a/test/bikeriding.asm b/test/fixtures/bikeriding.asm
similarity index 100%
rename from test/bikeriding.asm
rename to test/fixtures/bikeriding.asm
diff --git a/test/celadon.asm b/test/fixtures/celadon.asm
similarity index 100%
rename from test/celadon.asm
rename to test/fixtures/celadon.asm
diff --git a/test/cinnabar.asm b/test/fixtures/cinnabar.asm
similarity index 100%
rename from test/cinnabar.asm
rename to test/fixtures/cinnabar.asm
diff --git a/test/cinnabarmansion.asm b/test/fixtures/cinnabarmansion.asm
similarity index 100%
rename from test/cinnabarmansion.asm
rename to test/fixtures/cinnabarmansion.asm
diff --git a/test/cities1.asm b/test/fixtures/cities1.asm
similarity index 100%
rename from test/cities1.asm
rename to test/fixtures/cities1.asm
diff --git a/test/cities2.asm b/test/fixtures/cities2.asm
similarity index 100%
rename from test/cities2.asm
rename to test/fixtures/cities2.asm
diff --git a/test/credits.asm b/test/fixtures/credits.asm
similarity index 100%
rename from test/credits.asm
rename to test/fixtures/credits.asm
diff --git a/test/defeatedgymleader.asm b/test/fixtures/defeatedgymleader.asm
similarity index 100%
rename from test/defeatedgymleader.asm
rename to test/fixtures/defeatedgymleader.asm
diff --git a/test/defeatedtrainer.asm b/test/fixtures/defeatedtrainer.asm
similarity index 100%
rename from test/defeatedtrainer.asm
rename to test/fixtures/defeatedtrainer.asm
diff --git a/test/defeatedwildmon.asm b/test/fixtures/defeatedwildmon.asm
similarity index 100%
rename from test/defeatedwildmon.asm
rename to test/fixtures/defeatedwildmon.asm
diff --git a/test/dungeon1.asm b/test/fixtures/dungeon1.asm
similarity index 100%
rename from test/dungeon1.asm
rename to test/fixtures/dungeon1.asm
diff --git a/test/dungeon2.asm b/test/fixtures/dungeon2.asm
similarity index 100%
rename from test/dungeon2.asm
rename to test/fixtures/dungeon2.asm
diff --git a/test/dungeon3.asm b/test/fixtures/dungeon3.asm
similarity index 100%
rename from test/dungeon3.asm
rename to test/fixtures/dungeon3.asm
diff --git a/test/finalbattle.asm b/test/fixtures/finalbattle.asm
similarity index 100%
rename from test/finalbattle.asm
rename to test/fixtures/finalbattle.asm
diff --git a/test/gamecorner.asm b/test/fixtures/gamecorner.asm
similarity index 100%
rename from test/gamecorner.asm
rename to test/fixtures/gamecorner.asm
diff --git a/test/gym.asm b/test/fixtures/gym.asm
similarity index 100%
rename from test/gym.asm
rename to test/fixtures/gym.asm
diff --git a/test/gymleaderbattle.asm b/test/fixtures/gymleaderbattle.asm
similarity index 100%
rename from test/gymleaderbattle.asm
rename to test/fixtures/gymleaderbattle.asm
diff --git a/test/halloffame.asm b/test/fixtures/halloffame.asm
similarity index 100%
rename from test/halloffame.asm
rename to test/fixtures/halloffame.asm
diff --git a/test/indigoplateau.asm b/test/fixtures/indigoplateau.asm
similarity index 100%
rename from test/indigoplateau.asm
rename to test/fixtures/indigoplateau.asm
diff --git a/test/introbattle.asm b/test/fixtures/introbattle.asm
similarity index 100%
rename from test/introbattle.asm
rename to test/fixtures/introbattle.asm
diff --git a/test/jigglypuffsong.asm b/test/fixtures/jigglypuffsong.asm
similarity index 100%
rename from test/jigglypuffsong.asm
rename to test/fixtures/jigglypuffsong.asm
diff --git a/test/lavender.asm b/test/fixtures/lavender.asm
similarity index 100%
rename from test/lavender.asm
rename to test/fixtures/lavender.asm
diff --git a/test/meeteviltrainer.asm b/test/fixtures/meeteviltrainer.asm
similarity index 100%
rename from test/meeteviltrainer.asm
rename to test/fixtures/meeteviltrainer.asm
diff --git a/test/meetfemaletrainer.asm b/test/fixtures/meetfemaletrainer.asm
similarity index 100%
rename from test/meetfemaletrainer.asm
rename to test/fixtures/meetfemaletrainer.asm
diff --git a/test/meetjessiejames.asm b/test/fixtures/meetjessiejames.asm
similarity index 100%
rename from test/meetjessiejames.asm
rename to test/fixtures/meetjessiejames.asm
diff --git a/test/meetmaletrainer.asm b/test/fixtures/meetmaletrainer.asm
similarity index 100%
rename from test/meetmaletrainer.asm
rename to test/fixtures/meetmaletrainer.asm
diff --git a/test/meetprofoak.asm b/test/fixtures/meetprofoak.asm
similarity index 100%
rename from test/meetprofoak.asm
rename to test/fixtures/meetprofoak.asm
diff --git a/test/meetrival.asm b/test/fixtures/meetrival.asm
similarity index 100%
rename from test/meetrival.asm
rename to test/fixtures/meetrival.asm
diff --git a/test/museumguy.asm b/test/fixtures/museumguy.asm
similarity index 100%
rename from test/museumguy.asm
rename to test/fixtures/museumguy.asm
diff --git a/test/oakslab.asm b/test/fixtures/oakslab.asm
similarity index 100%
rename from test/oakslab.asm
rename to test/fixtures/oakslab.asm
diff --git a/test/pallettown.asm b/test/fixtures/pallettown.asm
similarity index 100%
rename from test/pallettown.asm
rename to test/fixtures/pallettown.asm
diff --git a/test/pkmnhealed.asm b/test/fixtures/pkmnhealed.asm
similarity index 100%
rename from test/pkmnhealed.asm
rename to test/fixtures/pkmnhealed.asm
diff --git a/test/pokecenter.asm b/test/fixtures/pokecenter.asm
similarity index 100%
rename from test/pokecenter.asm
rename to test/fixtures/pokecenter.asm
diff --git a/test/pokemontower.asm b/test/fixtures/pokemontower.asm
similarity index 100%
rename from test/pokemontower.asm
rename to test/fixtures/pokemontower.asm
diff --git a/test/routes1.asm b/test/fixtures/routes1.asm
similarity index 100%
rename from test/routes1.asm
rename to test/fixtures/routes1.asm
diff --git a/test/routes2.asm b/test/fixtures/routes2.asm
similarity index 100%
rename from test/routes2.asm
rename to test/fixtures/routes2.asm
diff --git a/test/routes3.asm b/test/fixtures/routes3.asm
similarity index 100%
rename from test/routes3.asm
rename to test/fixtures/routes3.asm
diff --git a/test/routes4.asm b/test/fixtures/routes4.asm
similarity index 100%
rename from test/routes4.asm
rename to test/fixtures/routes4.asm
diff --git a/test/safarizone.asm b/test/fixtures/safarizone.asm
similarity index 100%
rename from test/safarizone.asm
rename to test/fixtures/safarizone.asm
diff --git a/test/silphco.asm b/test/fixtures/silphco.asm
similarity index 100%
rename from test/silphco.asm
rename to test/fixtures/silphco.asm
diff --git a/test/ssanne.asm b/test/fixtures/ssanne.asm
similarity index 100%
rename from test/ssanne.asm
rename to test/fixtures/ssanne.asm
diff --git a/test/surfing.asm b/test/fixtures/surfing.asm
similarity index 100%
rename from test/surfing.asm
rename to test/fixtures/surfing.asm
diff --git a/test/surfingpikachu.asm b/test/fixtures/surfingpikachu.asm
similarity index 100%
rename from test/surfingpikachu.asm
rename to test/fixtures/surfingpikachu.asm
diff --git a/test/titlescreen.asm b/test/fixtures/titlescreen.asm
similarity index 100%
rename from test/titlescreen.asm
rename to test/fixtures/titlescreen.asm
diff --git a/test/trainerbattle.asm b/test/fixtures/trainerbattle.asm
similarity index 100%
rename from test/trainerbattle.asm
rename to test/fixtures/trainerbattle.asm
diff --git a/test/unusedsong.asm b/test/fixtures/unusedsong.asm
similarity index 100%
rename from test/unusedsong.asm
rename to test/fixtures/unusedsong.asm
diff --git a/test/vermilion.asm b/test/fixtures/vermilion.asm
similarity index 100%
rename from test/vermilion.asm
rename to test/fixtures/vermilion.asm
diff --git a/test/wildbattle.asm b/test/fixtures/wildbattle.asm
similarity index 100%
rename from test/wildbattle.asm
rename to test/fixtures/wildbattle.asm
diff --git a/test/yellowintro.asm b/test/fixtures/yellowintro.asm
similarity index 100%
rename from test/yellowintro.asm
rename to test/fixtures/yellowintro.asm
diff --git a/test/yellowunusedsong.asm b/test/fixtures/yellowunusedsong.asm
similarity index 100%
rename from test/yellowunusedsong.asm
rename to test/fixtures/yellowunusedsong.asm
diff --git a/test.sh b/test/run
similarity index 83%
rename from test.sh
rename to test/run
index 701bd3f..78ae02b 100755
--- a/test.sh
+++ b/test/run
@@ -2,7 +2,7 @@
 set -e
 set -u
 
-for asm in test/*.asm; do
+for asm in `dirname $0`/fixtures/*.asm; do
   echo " => $asm"
   echo "asm -> mid"
   dist/build/pokemid/pokemid $asm $asm.mid