Tests passing

celery/tests/app/test_app.py

@@ -432,11 +432,13 @@ class test_App(AppCase):
                              {'foo': 'bar'})
 
     def test_compat_setting_CELERY_BACKEND(self):
-        self.app._preconf = {}  # removes result backend set by AppCase
+        self.app._preconf = {}
+        self.app.conf.defaults[0]['CELERY_RESULT_BACKEND'] = None
         self.app.config_from_object(Object(CELERY_BACKEND='set_by_us'))
         self.assertEqual(self.app.conf.CELERY_RESULT_BACKEND, 'set_by_us')
 
     def test_setting_BROKER_TRANSPORT_OPTIONS(self):
+
         _args = {'foo': 'bar', 'spam': 'baz'}
 
         self.app.config_from_object(Object())

celery/tests/case.py

@@ -84,9 +84,6 @@ Test {0} Modified handlers for the root logger\
 """
 
 CELERY_TEST_CONFIG = {
-    'BROKER_URL': 'memory://',
-    'CELERY_RESULT_BACKEND': 'cache+memory://',
-
     #: Don't want log output when running suite.
     'CELERYD_HIJACK_ROOT_LOGGER': False,
     'CELERY_SEND_TASK_ERROR_EMAILS': False,
@@ -127,10 +124,11 @@ class UnitLogging(symbol_by_name(Celery.log_cls)):
         self.already_setup = True
 
 
-def UnitApp(name=None, set_as_current=False, log=UnitLogging, **kwargs):
+def UnitApp(name=None, set_as_current=False, log=UnitLogging,
+            broker='memory://', backend='cache+memory://', **kwargs):
     app = Celery(name or 'celery.tests',
                  set_as_current=set_as_current,
-                 log=log,
+                 log=log, broker=broker, backend=backend,
                  **kwargs)
     app.add_defaults(deepcopy(CELERY_TEST_CONFIG))
     return app