diff --git a/Cargo.toml b/Cargo.toml
index 94940c1..d8b6e06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,11 +15,6 @@ categories = ["rendering","games","game-engine","multimedia"]
 name       = "sdl2"
 path       = "src/sdl2/lib.rs"
 
-
-[[test]]
-name="events"
-harness=false
-
 [dependencies]
 bitflags = "0.7"
 libc = "0.2"
diff --git a/tests/sine.wav b/assets/sine.wav
similarity index 100%
rename from tests/sine.wav
rename to assets/sine.wav
diff --git a/examples/audio-wav.rs b/examples/audio-wav.rs
index cd31232..d38d4c1 100644
--- a/examples/audio-wav.rs
+++ b/examples/audio-wav.rs
@@ -27,7 +27,7 @@ impl AudioCallback for Sound {
 
 fn main() {
     let wav_file : Cow<'static, Path> = match std::env::args().nth(1) {
-        None => Cow::from(Path::new("./tests/sine.wav")),
+        None => Cow::from(Path::new("./assets/sine.wav")),
         Some(s) => Cow::from(PathBuf::from(s))
     };
     let sdl_context = sdl2::init().unwrap();
diff --git a/tests/lib.rs b/tests/audio.rs
similarity index 75%
rename from tests/lib.rs
rename to tests/audio.rs
index 1ed3587..a2017d4 100644
--- a/tests/lib.rs
+++ b/tests/audio.rs
@@ -2,7 +2,7 @@ extern crate sdl2;
 
 #[test]
 fn audio_spec_wav() {
-    let wav = sdl2::audio::AudioSpecWAV::load_wav("./tests/sine.wav").unwrap();
+    let wav = sdl2::audio::AudioSpecWAV::load_wav("./assets/sine.wav").unwrap();
 
     assert_eq!(wav.freq, 22050);
     assert_eq!(wav.format, sdl2::audio::AudioFormat::S16LSB);
diff --git a/tests/events.rs b/tests/events.rs
index c8f8454..bb55066 100644
--- a/tests/events.rs
+++ b/tests/events.rs
@@ -1,7 +1,8 @@
 extern crate sdl2;
 use sdl2::event;
 
-fn main() {
+#[test]
+fn test_events() {
     let sdl = sdl2::init().unwrap();
     let ev = sdl.event().unwrap();
     let mut ep = sdl.event_pump().unwrap();
diff --git a/tests/video.rs b/tests/video.rs
new file mode 100644
index 0000000..7fce9f5
--- /dev/null
+++ b/tests/video.rs
@@ -0,0 +1,10 @@
+extern crate sdl2;
+
+#[test]
+fn display_name_no_segfault() {
+    let sdl_context = sdl2::init().unwrap();
+    let video_subsystem = sdl_context.video().unwrap();
+    // hopefully no one has a 100 screen to see this test pass
+    let r = video_subsystem.display_name(99);
+    assert!(r.is_err());
+}