diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 03e17986afd..454d64aa5e0 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -553,7 +553,7 @@ pref("browser.EULA.2.accepted", true);
 // if we rev the EULA again, we should bump this so users agree to the new EULA
 pref("browser.EULA.version", 2);
 
-pref("browser.sessionstore.enabled", false);
+pref("browser.sessionstore.enabled", true);
 pref("browser.sessionstore.resume_from_crash", true);
 pref("browser.sessionstore.resume_session_once", false);
  
diff --git a/browser/components/sessionstore/Makefile.in b/browser/components/sessionstore/Makefile.in
index f99f6c74e08..754426761bc 100644
--- a/browser/components/sessionstore/Makefile.in
+++ b/browser/components/sessionstore/Makefile.in
@@ -50,8 +50,8 @@ XPIDLSRCS = \
 
 DIRS = src
 
-#ifdef MOZ_MOCHITEST
-#DIRS += test
-#endif
+ifdef MOZ_MOCHITEST
+DIRS += test
+endif
 
 include $(topsrcdir)/config/rules.mk