diff --git a/.gitignore b/.gitignore
index 272b48b6..bb33d39a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ test/tutorial/tut02
 test/tutorial/tut03
 test/benchsuite
 test/quad
-test/sandbox
+test/sandbox/sample
 test/math/pi
 test/math/poly
 test/math/remez
diff --git a/configure.ac b/configure.ac
index a7a9b246..3dd79dbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,6 +339,7 @@ AC_CONFIG_FILES(
   src/Makefile
   test/Makefile
   test/math/Makefile
+  test/sandbox/Makefile
   test/tutorial/Makefile
   test/xolotl/Makefile
   gfx/Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index d3987023..0d275bdb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = math tutorial xolotl
+SUBDIRS = math tutorial sandbox xolotl
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
@@ -8,7 +8,6 @@ bench: benchsuite$(EXEEXT)
 
 all-local: $(noinst_PROGRAMS)
 	test x$(MAKE_FSELF) = xno || make_fself quad$(EXEEXT) quad.self
-	test x$(MAKE_FSELF) = xno || make_fself sandbox$(EXEEXT) sandbox.self
 	test x$(MAKE_FSELF) = xno || make_fself benchsuite$(EXEEXT) benchsuite.self
 	test x$(MAKE_FSELF) = xno || make_fself testsuite$(EXEEXT) testsuite.self
 
@@ -18,7 +17,7 @@ CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
 
 EXTRA_DIST = data/gradient.png
 
-noinst_PROGRAMS = quad sandbox benchsuite testsuite
+noinst_PROGRAMS = quad benchsuite testsuite
 
 TESTS = testsuite
 
@@ -41,8 +40,3 @@ quad_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
 quad_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 quad_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
-sandbox_SOURCES = debug/sandbox.cpp
-sandbox_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-sandbox_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
-sandbox_DEPENDENCIES = $(top_builddir)/src/liblol.a
-
diff --git a/test/math/Makefile.am b/test/math/Makefile.am
index c8b6ea11..a245a8e1 100644
--- a/test/math/Makefile.am
+++ b/test/math/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 
 all-local: $(noinst_PROGRAMS)
 	test x$(MAKE_FSELF) = xno || make_fself pi$(EXEEXT) pi.self
-	test x$(MAKE_FSELF) = xno || make_fself poly$(EXEEXT) pi.self
+	test x$(MAKE_FSELF) = xno || make_fself poly$(EXEEXT) poly.self
 	test x$(MAKE_FSELF) = xno || make_fself remez$(EXEEXT) remez.self
 
 CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
diff --git a/test/sandbox/Makefile.am b/test/sandbox/Makefile.am
new file mode 100644
index 00000000..2e2e9330
--- /dev/null
+++ b/test/sandbox/Makefile.am
@@ -0,0 +1,17 @@
+
+AM_CPPFLAGS = -I$(top_srcdir)/src
+
+all-local: $(noinst_PROGRAMS)
+	test x$(MAKE_FSELF) = xno || make_fself sample$(EXEEXT) sample.self
+
+CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
+             $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
+             $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
+
+noinst_PROGRAMS = sample
+
+sample_SOURCES = sample.cpp
+sample_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
+sample_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+sample_DEPENDENCIES = $(top_builddir)/src/liblol.a
+
diff --git a/test/debug/sandbox.cpp b/test/sandbox/sample.cpp
similarity index 100%
rename from test/debug/sandbox.cpp
rename to test/sandbox/sample.cpp