anchor.diff:  				 | TmpConfig]
   			end;
   		    _ ->
  +			%% We use erlang.org for the proxy tests 
  +			%% and after the switch to erlang-web, many
  +			%% of the test cases no longer work (erlang.org
  +			%% previously run on Apache). 
  +			%% Until we have had time to update inets
  +			%% (and updated erlang.org to use that inets) 
  +			%% and the test cases, we simply skip the 
  +			%% problematic test cases. 
  +			%% This is not ideal, but I am busy....
   			case is_proxy_available(?PROXY, ?PROXY_PORT) of
   			    true ->
  -				inets:start(),
  -				[{watchdog, Dog} | TmpConfig];
  +				BadCases = 
  +				    [
  +				     "delete", 
  +				     "get", 
  +				     "head", 
  +				     "not_modified_otp_6821", 
  +				     "options", 
  +				     "page_does_not_exist", 
  +				     "post", 
  +				     "put", 
  +				     "stream"
  +				    ],
  +				case lists:member(Rest, BadCases) of
  +				    true ->
  +					[{skip, "TC and server not compatible"}|
  +					 TmpConfig];
  +				    false ->
  +					inets:start(),
  +					[{watchdog, Dog} | TmpConfig]
  +				end;
   			    false ->
  -				[{skip, "Failed to contact proxy"} | 
  -				 TmpConfig]
  +				[{skip, "proxy not responding"} | TmpConfig]
   			end
   		end;
   	    _ -> 
  
positive.code: proxy_delete(Config) when is_list(Config) ->
      %% As of 2011-03-24, erlang.org (which is used as server) 
      %% does no longer run Apache, but instead runs inets.
      ?SKIP(tc_and_server_not_compatible),
      case ?config(skip, Config) of 
  	undefined -> 
  	    URL = ?PROXY_URL ++ "/foobar.html",
  
negative.code: proxy_head(Config) when is_list(Config) ->
      %% As of 2011-03-24, erlang.org (which is used as server) 
      %% does no longer run Apache, but instead runs inets.
      case ?config(skip, Config) of 
  	undefined ->
  	    case httpc:request(head, {?PROXY_URL, []}, [], []) of
  