diff --git a/content/canvas/Makefile.in b/content/canvas/Makefile.in
index 66325f16ee36..a1893f647bfe 100644
--- a/content/canvas/Makefile.in
+++ b/content/canvas/Makefile.in
@@ -14,5 +14,9 @@ PARALLEL_DIRS	= public src
 
 TEST_DIRS += test
 
+ifdef ENABLE_TESTS
+TOOL_DIRS += compiledtest
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/content/canvas/test/compiled/Makefile.in b/content/canvas/compiledtest/Makefile.in
similarity index 92%
rename from content/canvas/test/compiled/Makefile.in
rename to content/canvas/compiledtest/Makefile.in
index ecbb81d5639e..fa869191e56b 100644
--- a/content/canvas/test/compiled/Makefile.in
+++ b/content/canvas/compiledtest/Makefile.in
@@ -12,8 +12,8 @@ FAIL_ON_WARNINGS = 1
 include $(DEPTH)/config/autoconf.mk
 
 LOCAL_INCLUDES := \
-    -I$(srcdir)/../../src \
-    $(NULL)
+  -I$(srcdir)/../src \
+  $(NULL)
 
 CPP_UNIT_TESTS := \
   TestWebGLElementArrayCache.cpp \
diff --git a/content/canvas/test/compiled/TestWebGLElementArrayCache.cpp b/content/canvas/compiledtest/TestWebGLElementArrayCache.cpp
similarity index 100%
rename from content/canvas/test/compiled/TestWebGLElementArrayCache.cpp
rename to content/canvas/compiledtest/TestWebGLElementArrayCache.cpp
diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index f4f541196947..50eee735cc22 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 DIRS		+= webgl crossorigin chrome
 
-# TEST_DIRS += compiled
-
 include $(DEPTH)/config/autoconf.mk
 MOCHITEST_FILES = \
 	test_canvas.html \