diff -Nru libtest-www-mechanize-catalyst-perl-0.59/CHANGES libtest-www-mechanize-catalyst-perl-0.60/CHANGES
--- libtest-www-mechanize-catalyst-perl-0.59/CHANGES	2014-01-13 11:22:52.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/CHANGES	2014-12-26 21:46:38.000000000 +0000
@@ -1,5 +1,11 @@
 Revision history for Perl module Test::WWW::Mechanize::Catalyst:
 
+0.60 Fri Dec 26 22:00 GMT 2014
+     - Make two test cases compatible with Catalyst 5.90080+ changes
+       to encoding (UTF8 because default).
+     - Added a new test case that runs only under 5.90080 and makes
+       sure that expected UTF8 stuff works.
+
 0.59 Mon Jan 13 11:23 GMT 2014
      - Use Class::Load instead of Class::MOP::load_class(). RT#90978
      - Fix typos in POD and comments. RT#85171
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/debian/changelog libtest-www-mechanize-catalyst-perl-0.60/debian/changelog
--- libtest-www-mechanize-catalyst-perl-0.59/debian/changelog	2014-01-15 21:13:44.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/debian/changelog	2015-08-07 14:02:55.000000000 +0000
@@ -1,3 +1,22 @@
+libtest-www-mechanize-catalyst-perl (0.60-1) unstable; urgency=medium
+
+  [ gregor herrmann ]
+  * Drop xz compression for {binary,source} package, set by default by
+    dpkg since 1.17.{0,6}.
+  * Strip trailing slash from metacpan URLs.
+
+  [ Salvatore Bonaccorso ]
+  * Update Vcs-Browser URL to cgit web frontend
+
+  [ gregor herrmann ]
+  * Add debian/upstream/metadata.
+  * Import upstream version 0.60.
+  * Update upstream contact in d/copyright.
+  * Mark package as autopkgtest-able.
+  * Declare compliance with Debian Policy 3.9.6.
+
+ -- gregor herrmann <gregoa@debian.org>  Fri, 07 Aug 2015 16:02:45 +0200
+
 libtest-www-mechanize-catalyst-perl (0.59-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/debian/control libtest-www-mechanize-catalyst-perl-0.60/debian/control
--- libtest-www-mechanize-catalyst-perl-0.59/debian/control	2014-01-15 21:13:44.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/debian/control	2015-08-07 14:02:55.000000000 +0000
@@ -5,6 +5,7 @@
            Jonathan Yu <jawnsy@cpan.org>,
            Xavier Guimard <x.guimard@free.fr>
 Section: perl
+Testsuite: autopkgtest-pkg-perl
 Priority: optional
 Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl,
@@ -20,14 +21,13 @@
                      libwww-mechanize-perl,
                      libwww-perl,
                      netbase
-Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libtest-www-mechanize-catalyst-perl.git
+Standards-Version: 3.9.6
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libtest-www-mechanize-catalyst-perl.git
 Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libtest-www-mechanize-catalyst-perl.git
-Homepage: https://metacpan.org/release/Test-WWW-Mechanize-Catalyst/
+Homepage: https://metacpan.org/release/Test-WWW-Mechanize-Catalyst
 
 Package: libtest-www-mechanize-catalyst-perl
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends},
          ${perl:Depends},
          libcatalyst-perl (>= 5.90000),
@@ -43,4 +43,3 @@
  to easily test their Catalyst applications without starting up a web server;
  in fact, this module works by passing the HTTP request object directly to
  Catalyst.
-
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/debian/copyright libtest-www-mechanize-catalyst-perl-0.60/debian/copyright
--- libtest-www-mechanize-catalyst-perl-0.59/debian/copyright	2014-01-15 21:13:44.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/debian/copyright	2015-08-07 14:02:55.000000000 +0000
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Test-WWW-Mechanize-Catalyst
-Upstream-Contact: Ash Berlin <ash@cpan.org>
-Source: https://metacpan.org/release/Test-WWW-Mechanize-Catalyst/
+Upstream-Contact: John Napiorkowski <jjnapiork@cpan.org>
+Source: https://metacpan.org/release/Test-WWW-Mechanize-Catalyst
 
 Files: *
 Copyright: 2005-2009, Leon Brocard <acme@astray.com>
@@ -14,8 +14,8 @@
 License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: 2010, Jonathan Yu <jawnsy@cpan.org>
- 2009, Krzysztof Krzyżaniak (eloy) <eloy@debian.org>
+Copyright: 2009, Krzysztof Krzyżaniak (eloy) <eloy@debian.org>
+ 2010, Jonathan Yu <jawnsy@cpan.org>
  2012-2013, Xavier Guimard <x.guimard@free.fr>
 License: Artistic or GPL-1+
 
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/debian/rules libtest-www-mechanize-catalyst-perl-0.60/debian/rules
--- libtest-www-mechanize-catalyst-perl-0.59/debian/rules	2014-01-15 21:13:44.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/debian/rules	2015-08-07 14:02:55.000000000 +0000
@@ -6,5 +6,3 @@
 override_dh_auto_test:
 	http_proxy= dh_auto_test
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/debian/source/options libtest-www-mechanize-catalyst-perl-0.60/debian/source/options
--- libtest-www-mechanize-catalyst-perl-0.59/debian/source/options	2014-01-15 21:13:44.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/debian/source/options	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-compression = xz
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/debian/upstream/metadata libtest-www-mechanize-catalyst-perl-0.60/debian/upstream/metadata
--- libtest-www-mechanize-catalyst-perl-0.59/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/debian/upstream/metadata	2015-08-07 14:02:55.000000000 +0000
@@ -0,0 +1,5 @@
+---
+Archive: CPAN
+Contact: John Napiorkowski <jjnapiork@cpan.org>
+Name: Test-WWW-Mechanize-Catalyst
+Repository: git://git.shadowcat.co.uk/catagits/Test-WWW-Mechanize-Catalyst.git
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/debian/watch libtest-www-mechanize-catalyst-perl-0.60/debian/watch
--- libtest-www-mechanize-catalyst-perl-0.59/debian/watch	2014-01-15 21:13:44.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/debian/watch	2015-08-07 14:02:55.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-https://metacpan.org/release/Test-WWW-Mechanize-Catalyst/   .*/Test-WWW-Mechanize-Catalyst-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+https://metacpan.org/release/Test-WWW-Mechanize-Catalyst   .*/Test-WWW-Mechanize-Catalyst-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Base.pm libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Base.pm
--- libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Base.pm	2014-01-13 12:26:02.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Base.pm	2014-12-26 21:47:48.000000000 +0000
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.14';
 }
 
 # Suspend handler for "redefined" warnings
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Can.pm libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Can.pm
--- libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Can.pm	2014-01-13 12:26:03.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Can.pm	2014-12-26 21:47:48.000000000 +0000
@@ -8,7 +8,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.14';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Fetch.pm libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Fetch.pm
--- libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Fetch.pm	2014-01-13 12:26:03.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Fetch.pm	2014-12-26 21:47:48.000000000 +0000
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.14';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Makefile.pm libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Makefile.pm
--- libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Makefile.pm	2014-01-13 12:26:03.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Makefile.pm	2014-12-26 21:47:48.000000000 +0000
@@ -8,7 +8,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.14';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -133,7 +133,7 @@
 	return $args;
 }
 
-# For mm args that take multiple space-seperated args,
+# For mm args that take multiple space-separated args,
 # append an argument to the current list.
 sub makemaker_append {
 	my $self = shift;
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Metadata.pm libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Metadata.pm
--- libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Metadata.pm	2014-01-13 12:26:02.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Metadata.pm	2014-12-26 21:47:48.000000000 +0000
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.14';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -347,7 +347,7 @@
 		^ \s*
 		package \s*
 		([\w:]+)
-		\s* ;
+		[\s|;]*
 		/ixms
 	) {
 		my ($name, $module_name) = ($1, $1);
@@ -705,7 +705,7 @@
 	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
 	my $meta = $yaml[0];
 
-	# Overwrite the non-configure dependency hashs
+	# Overwrite the non-configure dependency hashes
 	delete $meta->{requires};
 	delete $meta->{build_requires};
 	delete $meta->{recommends};
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Win32.pm libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Win32.pm
--- libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/Win32.pm	2014-01-13 12:26:03.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/Win32.pm	2014-12-26 21:47:48.000000000 +0000
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.14';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/WriteAll.pm libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/WriteAll.pm
--- libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install/WriteAll.pm	2014-01-13 12:26:03.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install/WriteAll.pm	2014-12-26 21:47:48.000000000 +0000
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.06';
+	$VERSION = '1.14';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install.pm libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install.pm
--- libtest-www-mechanize-catalyst-perl-0.59/inc/Module/Install.pm	2014-01-13 12:26:02.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/inc/Module/Install.pm	2014-12-26 21:47:48.000000000 +0000
@@ -17,7 +17,7 @@
 #     3. The ./inc/ version of Module::Install loads
 # }
 
-use 5.005;
+use 5.006;
 use strict 'vars';
 use Cwd        ();
 use File::Find ();
@@ -31,7 +31,7 @@
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '1.06';
+	$VERSION = '1.14';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -156,10 +156,10 @@
 sub autoload {
 	my $self = shift;
 	my $who  = $self->_caller;
-	my $cwd  = Cwd::cwd();
+	my $cwd  = Cwd::getcwd();
 	my $sym  = "${who}::AUTOLOAD";
 	$sym->{$cwd} = sub {
-		my $pwd = Cwd::cwd();
+		my $pwd = Cwd::getcwd();
 		if ( my $code = $sym->{$pwd} ) {
 			# Delegate back to parent dirs
 			goto &$code unless $cwd eq $pwd;
@@ -239,7 +239,7 @@
 
 	# ignore the prefix on extension modules built from top level.
 	my $base_path = Cwd::abs_path($FindBin::Bin);
-	unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
+	unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) {
 		delete $args{prefix};
 	}
 	return $args{_self} if $args{_self};
@@ -338,7 +338,7 @@
 		if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
 			my $content = Module::Install::_read($subpath . '.pm');
 			my $in_pod  = 0;
-			foreach ( split //, $content ) {
+			foreach ( split /\n/, $content ) {
 				$in_pod = 1 if /^=\w/;
 				$in_pod = 0 if /^=cut/;
 				next if ($in_pod || /^=cut/);  # skip pod text
@@ -378,6 +378,7 @@
 sub _read {
 	local *FH;
 	open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+	binmode FH;
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
 	return $string;
@@ -386,6 +387,7 @@
 sub _read {
 	local *FH;
 	open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
+	binmode FH;
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
 	return $string;
@@ -416,6 +418,7 @@
 sub _write {
 	local *FH;
 	open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+	binmode FH;
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";
 	}
@@ -425,6 +428,7 @@
 sub _write {
 	local *FH;
 	open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
+	binmode FH;
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";
 	}
@@ -434,7 +438,7 @@
 
 # _version is for processing module versions (eg, 1.03_05) not
 # Perl versions (eg, 5.8.1).
-sub _version ($) {
+sub _version {
 	my $s = shift || 0;
 	my $d =()= $s =~ /(\.)/g;
 	if ( $d >= 2 ) {
@@ -450,12 +454,12 @@
 	return $l + 0;
 }
 
-sub _cmp ($$) {
+sub _cmp {
 	_version($_[1]) <=> _version($_[2]);
 }
 
 # Cloned from Params::Util::_CLASS
-sub _CLASS ($) {
+sub _CLASS {
 	(
 		defined $_[0]
 		and
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/lib/Test/WWW/Mechanize/Catalyst.pm libtest-www-mechanize-catalyst-perl-0.60/lib/Test/WWW/Mechanize/Catalyst.pm
--- libtest-www-mechanize-catalyst-perl-0.59/lib/Test/WWW/Mechanize/Catalyst.pm	2014-01-13 11:22:32.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/lib/Test/WWW/Mechanize/Catalyst.pm	2014-12-26 21:46:55.000000000 +0000
@@ -13,7 +13,7 @@
 
 #use namespace::clean -except => 'meta';
 
-our $VERSION = '0.59';
+our $VERSION = '0.60';
 our $APP_CLASS;
 my $Test = Test::Builder->new();
 
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/MANIFEST libtest-www-mechanize-catalyst-perl-0.60/MANIFEST
--- libtest-www-mechanize-catalyst-perl-0.59/MANIFEST	2014-01-13 12:26:06.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/MANIFEST	2014-12-26 21:47:54.000000000 +0000
@@ -27,4 +27,5 @@
 t/simple.t
 t/two_app.t
 t/useragent.t
+t/utf8.t
 t/white_label.t
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/META.yml libtest-www-mechanize-catalyst-perl-0.60/META.yml
--- libtest-www-mechanize-catalyst-perl-0.59/META.yml	2014-01-13 12:26:03.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/META.yml	2014-12-26 21:47:48.000000000 +0000
@@ -7,13 +7,13 @@
   Catalyst::Plugin::Session::Store::Dummy: 0
   ExtUtils::MakeMaker: 6.59
   Test::Exception: 0
-  Test::More: 0.88
+  Test::More: '0.88'
   Test::utf8: 0
 configure_requires:
   ExtUtils::MakeMaker: 6.59
 distribution_type: module
 dynamic_config: 1
-generated_by: 'Module::Install version 1.06'
+generated_by: 'Module::Install version 1.14'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,15 +24,15 @@
     - inc
     - t
 requires:
-  Catalyst: 5.90
-  Class::Load: 0.19
-  LWP: 5.816
-  Moose: 0.67
-  Test::WWW::Mechanize: 1.14
-  WWW::Mechanize: 1.54
-  namespace::clean: 0.09
+  Catalyst: '5.90'
+  Class::Load: '0.19'
+  LWP: '5.816'
+  Moose: '0.67'
+  Test::WWW::Mechanize: '1.14'
+  WWW::Mechanize: '1.54'
+  namespace::clean: '0.09'
   perl: 5.8.4
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://git.shadowcat.co.uk/catagits/Test-WWW-Mechanize-Catalyst.git
-version: 0.59
+version: '0.60'
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/t/lib/Catty/Controller/Root.pm libtest-www-mechanize-catalyst-perl-0.60/t/lib/Catty/Controller/Root.pm
--- libtest-www-mechanize-catalyst-perl-0.59/t/lib/Catty/Controller/Root.pm	2014-01-13 11:15:26.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/t/lib/Catty/Controller/Root.pm	2014-12-26 20:57:12.000000000 +0000
@@ -24,6 +24,10 @@
     my $html = html( "Hello", "Hi there! $str" );
     $context->response->content_type("text/html; charset=utf-8");
     $context->response->output($html);
+
+    # Newer Catalyst auto encodes UTF8, but this test case is borked and expects
+    # broken utf8 behavior.  We'll make a real UTF8 Test case separately.
+    $context->clear_encoding if $context->can('clear_encoding'); # Compat with upcoming Catalyst 5.90080
 }
 
 # absolute redirect
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/t/lib/ExternalCatty/Controller/Root.pm libtest-www-mechanize-catalyst-perl-0.60/t/lib/ExternalCatty/Controller/Root.pm
--- libtest-www-mechanize-catalyst-perl-0.59/t/lib/ExternalCatty/Controller/Root.pm	2014-01-13 11:15:26.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/t/lib/ExternalCatty/Controller/Root.pm	2014-12-26 20:57:23.000000000 +0000
@@ -10,6 +10,10 @@
     my ( $self, $c ) = @_;
     $c->response->content_type('text/html; charset=utf-8');
     $c->response->output( html( 'Root', 'Hello, test ☺!' ) );
+
+    # Newer Catalyst auto encodes UTF8, but this test case is borked and expects
+    # broken utf8 behavior.  We'll make a real UTF8 Test case separately.
+    $c->clear_encoding if $c->can('clear_encoding'); # Compat with upcoming Catalyst 5.90080
 }
 
 # redirect to a redirect
diff -Nru libtest-www-mechanize-catalyst-perl-0.59/t/utf8.t libtest-www-mechanize-catalyst-perl-0.60/t/utf8.t
--- libtest-www-mechanize-catalyst-perl-0.59/t/utf8.t	1970-01-01 00:00:00.000000000 +0000
+++ libtest-www-mechanize-catalyst-perl-0.60/t/utf8.t	2014-12-26 21:15:10.000000000 +0000
@@ -0,0 +1,40 @@
+use utf8;
+use warnings;
+use strict;
+use Test::More;
+use Encode 2.21 'decode_utf8', 'encode_utf8';
+use lib 't/lib';
+
+{
+  package MyApp::Controller::Root;
+  $INC{'MyApp/Controller/Root.pm'} = __FILE__;
+
+  use base 'Catalyst::Controller';
+
+  sub heart :Path('♥') {
+    my ($self, $c) = @_;
+    $c->response->content_type('text/html');
+    $c->response->body("<p>This is path-heart action ♥</p>");
+  }
+
+  package MyApp;
+  use Catalyst;
+
+  MyApp->setup;
+}
+
+use Test::WWW::Mechanize::Catalyst 'MyApp';
+
+my $root = "http://localhost";
+my $m = Test::WWW::Mechanize::Catalyst->new( autocheck => 0 );
+
+if(MyApp->can('encoding') and MyApp->can('clear_encoding') and MyApp->encoding eq 'UTF-8') {
+  $m->get_ok("$root/root/♥", 'got page');
+  is( $m->ct, "text/html" );
+  $m->content_contains("This is path-heart action ♥", 'matched expected content');
+} else {
+  ok 1, 'Skipping the UTF8 Tests for older installed catalyst';
+}
+
+done_testing;
+