diff --git a/js/jetpack/Makefile.in b/js/jetpack/Makefile.in
index 460df1a5f3c5..51ef103a4f5b 100644
--- a/js/jetpack/Makefile.in
+++ b/js/jetpack/Makefile.in
@@ -79,9 +79,10 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
-ifdef ENABLE_TESTS
-TOOL_DIRS += tests
-endif
+# Bug 629197: disabled jetpack service (and its tests).
+# ifdef ENABLE_TESTS
+# TOOL_DIRS += tests
+# endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
index bdbdf359e090..3f58cea3f3eb 100644
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -135,7 +135,7 @@
 #define LAYOUT_DEBUG_MODULE
 #endif
 
-#ifdef MOZ_IPC
+#if defined(MOZ_IPC) && defined(ENABLE_JETPACK_SERVICE)
 #define JETPACK_MODULES \
     MODULE(jetpack)
 #else