anchor.diff:  cleanup(Test, CleanupFun, setup) ->
       %% Remove existing ring files so we have a fresh ring
       os:cmd("rm -rf " ++ Test ++ "/ring"),
  -    cleanup(Test, CleanupFun, ok);
  -cleanup(Test, CleanupFun, _) ->
  +    cleanup(Test, CleanupFun, []);
  +cleanup(Test, CleanupFun, StartedApps) ->
       Deps = lists:reverse(dep_apps(Test, CleanupFun)),
  -
  -    %% Stop the applications in reverse order
  -    do_dep_apps(stop, Deps),
  +    Apps = Deps ++ lists:filtermap(fun(A) ->
  +                                           not lists:member(A, Deps)
  +                                   end, lists:reverse(StartedApps)),
  +
  +    %% Stop the applications in reverse order.
  +    do_dep_apps(stop, Apps),
   
       %% Cleanup potentially runaway processes
       catch exit(whereis(riak_kv_vnode_master), kill),
  
positive.code:            (_) -> ok
          end,
  
      [sasl, Silencer, crypto, asn1, public_key, ssl, riak_sysmon, os_mon, pbkdf2,
       runtime_tools, erlang_js, inets, mochiweb, webmachine, sidejob, poolboy,
       basho_stats, bitcask, compiler, syntax_tools, lager, folsom, protobuffs,
       eleveldb, riak_core, riak_pipe, riak_api, riak_dt, riak_pb, riak_kv, DefaultSetupFun, Extra].
  
  
  %% @doc Runs the application-lifecycle phase across all of the given
  %% applications and functions.
  %% @see dep_apps/2
  -spec do_dep_apps(load | start | stop, [ atom() | fun() ]) -> [ any() ].
  do_dep_apps(StartStop, Apps) ->
      lists:map(fun(A) when is_atom(A) ->
                        case include_app_phase(StartStop, A) of
                            true -> application:StartStop(A);
                            _ -> ok
                        end;
                   (F)                 -> F(StartStop)
                end, Apps).
  
  %% @doc Determines whether a given application should be modified in
  
negative.code:     net_kernel:start([TestNode, longnames]),
  
      %% Start dependent applications
      AllApps = do_dep_apps(start, Deps),
  
      %% Wait for KV to be ready
      riak_core:wait_for_application(riak_kv),
      riak_core:wait_for_service(riak_kv),
      AllApps.
  
  %% @doc Performs generic, riak_kv-specific and test-specific cleanup
  %% when used within a test fixture. This includes stopping dependent
  