diff --git a/.gitignore b/.gitignore
index a3aa04cf..70481c40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .sconsign.dblite
 ocarina.bin
 include/version.h
+test_*
diff --git a/Sconstruct b/Sconstruct
index bca1a653..3387a2e0 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -48,9 +48,21 @@ def list_dirs(directory):
 
 # Note: a version.h file is not created in this directory,
 # so the command will always run.
-Default( env.Command("version.h", None, version_h) )
+version_h=env.Command("version.h", None, version_h)
 ocarina=env.Program('ocarina.bin', list_dirs('libsaria') + list_dirs('ocarina'))
-Default(ocarina)
+Default([version_h, ocarina])
+
+tests=os.listdir("tests/")
+test_list = []
+for test in tests:
+	if test[0] == ".":
+		continue;
+	split = test.rsplit(".", 1);
+	src = "tests/" + test
+	dst = "test_" + split[0]
+	test_list.append(env.Program(dst, list_dirs('libsaria') + [src]))
+
+env.Alias("tests", [version_h] + [test_list]);
 
 # Install Ocarina
 scripts = os.listdir("scripts/")
diff --git a/tests/libsaria.cpp b/tests/libsaria.cpp
new file mode 100644
index 00000000..e40a5309
--- /dev/null
+++ b/tests/libsaria.cpp
@@ -0,0 +1,9 @@
+#include <libsaria/libsaria.h>
+
+int main (int argc, char **argv)
+{
+	libsaria::init(argc, argv);
+	while (libsaria::idle::run_task() != 0);
+	libsaria::quit();
+	return 0;
+}