6 files changed, 38 insertions, 32 deletions
diff --git a/t/00-load.t b/t/00-load.t
deleted file mode 100644
index d4ef20b..0000000
--- a/t/00-load.t
+++ /dev/null
@@ -1,7 +0,0 @@
-use strict;
-use warnings;
-use Test::More tests => 1;
-
-BEGIN {
-    use_ok( 'Dancer::Template::Xslate' ) || print "Bail out!";
-}
diff --git a/t/01-main.t b/t/01-main.t
index 97682ed..c0961e3 100644
--- a/t/01-main.t
+++ b/t/01-main.t
@@ -1,16 +1,15 @@
 use strict;
 use warnings;
 use Test::More tests => 2;
-use Dancer::FileUtils 'path';
+use File::Spec::Functions qw(catfile);
 
 use Dancer::Template::Xslate;
 
-my $engine;
-eval { $engine = Dancer::Template::Xslate->new };
-is $@, '',
-  "Dancer::Template::Xslate engine created";
-
-my $template = path('t', 'index.xslate');
+ok(
+    my $engine = Dancer::Template::Xslate->new,
+    "Dancer::Template::Xslate engine created"
+);
+my $template = catfile(qw(t views index.xslate));
 
 my $result = $engine->render(
     $template,
diff --git a/t/02-app.t b/t/02-app.t
index 40d0d27..737008e 100644
--- a/t/02-app.t
+++ b/t/02-app.t
@@ -1,20 +1,12 @@
 use strict;
 use warnings;
-use Test::More import => ["!pass"];
-
-use Dancer ':syntax';
-use Dancer::Test;
-
-plan tests => 3;
-
-setting views   => 't';
-setting template => 'xslate';
-
-ok(
-    get '/' => sub {
-        template 'index', { loop => [1..2] };
-    }
-);
-
-route_exists [ GET => '/' ];
-response_content_like( [ GET => '/' ], qr/1<br \/>\n2/ );
+use Test::More tests => 2;
+use File::Spec;
+
+{
+    use Dancer::Test;
+    use lib File::Spec->catdir(qw(t lib));
+    use TestApp;
+    route_exists [ GET => '/' ];
+    response_content_like( [ GET => '/' ], qr/1<br \/>\n2/ );
+}
diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
new file mode 100644
index 0000000..32b7255
--- /dev/null
+++ b/t/lib/TestApp.pm
@@ -0,0 +1,22 @@
+package
+TestApp;
+
+use strict;
+use warnings;
+use Dancer ':syntax';
+use File::Spec::Functions qw(catdir);
+
+set views    => catdir qw(t views);
+set engines => {
+    xslate => {
+        cache     => 0,
+        extension => 'tx',
+    },
+};
+set template => 'xslate';
+set logger   => 'console';
+set log      => 'warning';
+
+get '/' => sub { return template 'index', { loop => [1, 2] } };
+
+true;
diff --git a/t/index.tx b/t/views/index.tx
index 8ecc8e1..8ecc8e1 100644
--- a/t/index.tx
+++ b/t/views/index.tx
diff --git a/t/index.xslate b/t/views/index.xslate
index 7ec6233..7ec6233 100644
--- a/t/index.xslate
+++ b/t/views/index.xslate