Index: branches/release-35/t/65-ssi.t
===================================================================
--- branches/release-35/t/65-ssi.t (revision 1541)
+++ branches/release-35/t/65-ssi.t (revision 1949)
@@ -20,4 +20,5 @@
 
 my $blog = MT->model('blog')->load(1);
+$blog->include_cache(1);
 
 my $include = MT->model('template')->new;
@@ -43,5 +44,5 @@
 $tmpl = MT->model('template')->new;
 $tmpl->blog_id($blog->id);
-$tmpl->text(q(hi <mt:include module="Included Template" key="woot" ttl="1000"> bye));
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="woot" ttl="1000"> bye));
 
 $ctx = MT::Template::Context->new;
@@ -59,5 +60,5 @@
 $tmpl = MT->model('template')->new;
 $tmpl->blog_id($blog->id);
-$tmpl->text(q(hi <mt:include module="Included Template" key="woot" ttl="1000"> bye));
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="woot" ttl="1000"> bye));
 
 $ctx = MT::Template::Context->new;
@@ -75,5 +76,5 @@
 $tmpl = MT->model('template')->new;
 $tmpl->blog_id($blog->id);
-$tmpl->text(q(hi <mt:include module="Included Template" key="woot" ttl="1000" ssi="1"> bye));
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="woot" ttl="1000" ssi="1"> bye));
 
 $ctx = MT::Template::Context->new;
@@ -82,6 +83,8 @@
 
 ok(defined $out, 'test template built');
-my $sitepath = $blog->site_path;
-like($out, qr(\Ahi <!--#include file="${sitepath}includes_c/woo/woot.html" --> bye\z)ms,
+my $site_url = $blog->site_url;
+$site_url =~ s{ \A \w+ :// [^/]+ }{}xms;
+$site_url =~ s{ / \z }{}xms;
+like($out, qr(\Ahi <!--#include virtual="${site_url}/includes_c/woot/included_template.html" --> bye\z)ms,
     'test template included template by ssi');
 
@@ -89,5 +92,5 @@
 $tmpl = MT->model('template')->new;
 $tmpl->blog_id($blog->id);
-$tmpl->text(q(hi <mt:include module="Included Template" key="w" ttl="1000" ssi="1"> bye));
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="w" ttl="1000" ssi="1"> bye));
 
 $ctx = MT::Template::Context->new;
@@ -96,6 +99,8 @@
 
 ok(defined $out, 'test template built');
-$sitepath = $blog->site_path;
-like($out, qr(\Ahi <!--#include file="${sitepath}includes_c/w/w.html" --> bye\z)ms,
+$site_url = $blog->site_url;
+$site_url =~ s{ \A \w+ :// [^/]+ }{}xms;
+$site_url =~ s{ / \z }{}xms;
+like($out, qr(\Ahi <!--#include virtual="${site_url}/includes_c/w/included_template.html" --> bye\z)ms,
     'test template included template by ssi');