diff --git a/cpanfile b/cpanfile
index 6638c4e2c..852c469f9 100644
--- a/cpanfile
+++ b/cpanfile
@@ -35,7 +35,7 @@ requires 'Ref::Util';
 requires 'Safe::Isa';
 requires 'Sub::Quote';
 requires 'Template';
-requires 'Template::Tiny';
+requires 'Template::Tiny', '1.16';
 requires 'Test::Builder';
 requires 'Test::More';
 requires 'Types::Standard';
diff --git a/lib/Dancer2/Template/Implementation/ForkedTiny.pm b/lib/Dancer2/Template/Implementation/ForkedTiny.pm
deleted file mode 100644
index 6347a90da..000000000
--- a/lib/Dancer2/Template/Implementation/ForkedTiny.pm
+++ /dev/null
@@ -1,369 +0,0 @@
-package Dancer2::Template::Implementation::ForkedTiny;
-
-# ABSTRACT: Dancer2 own implementation of Template::Tiny
-
-use 5.00503;
-use strict;
-no warnings;
-use Ref::Util qw<is_arrayref is_coderef is_plain_hashref>;
-
-# Evaluatable expression
-my $EXPR = qr/ [a-z_][\w.]* /xs;
-
-sub new {
-    my $self = bless {
-        start_tag => '[%',
-        end_tag   => '%]',
-        @_[ 1 .. $#_ ]
-      },
-      $_[0];
-
-# Opening tag including whitespace chomping rules
-    my $LEFT = $self->{LEFT} = qr/
-    (?:
-        (?: (?:^|\n) [ \t]* )? \Q$self->{start_tag}\E\-
-        |
-        \Q$self->{start_tag}\E \+?
-    ) \s*
-/xs;
-
-# Closing %] tag including whitespace chomping rules
-    my $RIGHT = $self->{RIGHT} = qr/
-    \s* (?:
-        \+? \Q$self->{end_tag}\E
-        |
-        \-\Q$self->{end_tag}\E (?: [ \t]* \n )?
-    )
-/xs;
-
-# Preparsing run for nesting tags
-    $self->{PREPARSE} = qr/
-    $LEFT ( IF | UNLESS | FOREACH ) \s+
-        (
-            (?: \S+ \s+ IN \s+ )?
-        \S+ )
-    $RIGHT
-    (?!
-        .*?
-        $LEFT (?: IF | UNLESS | FOREACH ) \b
-    )
-    ( .*? )
-    (?:
-        $LEFT ELSE $RIGHT
-        (?!
-            .*?
-            $LEFT (?: IF | UNLESS | FOREACH ) \b
-        )
-        ( .+? )
-    )?
-    $LEFT END $RIGHT
-/xs;
-
-    $self->{CONDITION} = qr/
-    \Q$self->{start_tag}\E\s
-        ( ([IUF])\d+ ) \s+
-        (?:
-            ([a-z]\w*) \s+ IN \s+
-        )?
-        ( $EXPR )
-    \s\Q$self->{end_tag}\E
-    ( .*? )
-    (?:
-        \Q$self->{start_tag}\E\s \1 \s\Q$self->{end_tag}\E
-        ( .+? )
-    )?
-    \Q$self->{start_tag}\E\s \1 \s\Q$self->{end_tag}\E
-/xs;
-
-    $self;
-}
-
-# Copy and modify
-sub preprocess {
-    my $self = shift;
-    my $text = shift;
-    $self->_preprocess( \$text );
-    return $text;
-}
-
-sub process {
-    my $self  = shift;
-    my $copy  = ${ shift() };
-    my $stash = shift || {};
-
-    local $@  = '';
-    local $^W = 0;
-
-    # Preprocess to establish unique matching tag sets
-    $self->_preprocess( \$copy );
-
-    # Process down the nested tree of conditions
-    my $result = $self->_process( $stash, $copy );
-    if (@_) {
-        ${ $_[0] } = $result;
-    }
-    elsif ( defined wantarray ) {
-        require Carp;
-        Carp::carp(
-            'Returning of template results is deprecated in Template::Tiny 0.11'
-        );
-        return $result;
-    }
-    else {
-        print $result;
-    }
-}
-
-
-######################################################################
-# Support Methods
-
-# The only reason this is a standalone is so we can
-# do more in-depth testing.
-sub _preprocess {
-    my $self = shift;
-    my $copy = shift;
-
-    # Preprocess to establish unique matching tag sets
-    my $id = 0;
-    1 while $$copy =~ s/
-        $self->{PREPARSE}
-    /
-        my $tag = substr($1, 0, 1) . ++$id;
-        "\[\% $tag $2 \%\]$3\[\% $tag \%\]"
-        . (defined($4) ? "$4\[\% $tag \%\]" : '');
-    /sex;
-}
-
-sub _process {
-    my ( $self, $stash, $text ) = @_;
-
-    $text =~ s/
-        $self->{CONDITION}
-    /
-        ($2 eq 'F')
-            ? $self->_foreach($stash, $3, $4, $5)
-            : eval {
-                $2 eq 'U'
-                xor
-                !! # Force boolification
-                $self->_expression($stash, $4)
-            }
-                ? $self->_process($stash, $5)
-                : $self->_process($stash, $6)
-    /gsex;
-
-    # Resolve expressions
-    $text =~ s/
-        $self->{LEFT} ( $EXPR ) $self->{RIGHT}
-    /
-        eval {
-            $self->_expression($stash, $1)
-            . '' # Force stringification
-        }
-    /gsex;
-
-    # Trim the document
-    $text =~ s/^\s*(.+?)\s*\z/$1/s if $self->{TRIM};
-
-    return $text;
-}
-
-# Special handling for foreach
-sub _foreach {
-    my ( $self, $stash, $term, $expr, $text ) = @_;
-
-    # Resolve the expression
-    my $list = $self->_expression( $stash, $expr );
-    is_arrayref($list) or return '';
-
-    # Iterate
-    return join '',
-      map { $self->_process( { %$stash, $term => $_ }, $text ) } @$list;
-}
-
-# Evaluates a stash expression
-sub _expression {
-    my $cursor = $_[1];
-    my @path = split /\./, $_[2];
-    foreach (@path) {
-
-        # Support for private keys
-        return if substr( $_, 0, 1 ) eq '_';
-
-        # Split by data type
-        ref $cursor or return '';
-        if ( is_arrayref($cursor) ) {
-            return '' unless /^(?:0|[0-9]\d*)\z/;
-            $cursor = $cursor->[$_];
-        }
-        elsif ( is_plain_hashref($cursor) ) {
-            $cursor = $cursor->{$_};
-        }
-        else {
-            $cursor = $cursor->$_();
-        }
-    }
-
-    # If the last expression is a CodeRef, execute it
-    is_coderef($cursor)
-      and $cursor = $cursor->();
-    return $cursor;
-}
-
-1;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-Dancer2::Template::Implementation::ForkedTiny - Template Toolkit reimplemented in as little code as possible, forked from Template::Tiny
-
-=head1 SYNOPSIS
-
-  my $template = Dancer2::Template::Implementation::ForkedTiny->new(
-      TRIM => 1,
-  );
-
-  # Print the template results to STDOUT
-  $template->process( <<'END_TEMPLATE', { foo => 'World' } );
-  Hello [% foo %]!
-  END_TEMPLATE
-
-=head1 DESCRIPTION
-
-B<Dancer2::Template::Implementation::ForkedTiny> is a reimplementation of a subset of the functionality from
-L<Template> Toolkit in as few lines of code as possible.
-
-It is intended for use in light-usage, low-memory, or low-cpu templating
-situations, where you may need to upgrade to the full feature set in the
-future, or if you want the retain the familiarity of TT-style templates.
-
-For the subset of functionality it implements, it has fully-compatible template
-and stash API. All templates used with B<Dancer2::Template::Implementation::ForkedTiny> should be able to be
-transparently upgraded to full Template Toolkit.
-
-Unlike Template Toolkit, B<Dancer2::Template::Implementation::ForkedTiny> will process templates without a
-compile phase (but despite this is still quicker, owing to heavy use of
-the Perl regular expression engine.
-
-=head2 SUPPORTED USAGE
-
-By default, the C<[% %]> tag style is used. You can change the start tag and
-end tag by specifying them at object creation :
-
-  my $template = Dancer2::Template::Implementation::ForkedTiny->new(
-      start_tag => '<%',
-      end_tag => '%>,
-  );
-
-In the rest of the documentation, C<[% %]> will be used, but it can be of
-course your specified start / end tags.
-
-Both the C<[%+ +%]> style explicit whitespace and the C<[%- -%]> style
-explicit chomp B<are> support, although the C<[%+ +%]> version is unneeded
-in practice as B<Dancer2::Template::Implementation::ForkedTiny> does not support default-enabled C<PRE_CHOMP>
-or C<POST_CHOMP>.
-
-Variable expressions in the form C<[% foo.bar.baz %]> B<are> supported.
-
-Appropriate simple behaviours for C<ARRAY> references, C<HASH> references and
-objects are supported. "VMethods" such as [% array.length %] are B<not>
-supported at this time.
-
-If the resulting expression is a CodeRef, it'll be evaluated.
-
-C<IF>, C<ELSE> and C<UNLESS> conditional blocks B<are> supported, but only with
-simple C<[% foo.bar.baz %]> conditions.
-
-Support for looping (or rather iteration) is available in simple
-C<[% FOREACH item IN list %]> form B<is> supported. Other loop structures are
-B<not> supported. Because support for arbitrary or infinite looping is not
-available, B<Dancer2::Template::Implementation::ForkedTiny> templates are not turing complete. This is
-intentional.
-
-All of the four supported control structures C<IF>/C<ELSE>/C<UNLESS>/C<FOREACH>
-can be nested to arbitrary depth.
-
-The treatment of C<_private> hash and method keys is compatible with
-L<Template> Toolkit, returning null or false rather than the actual content
-of the hash key or method.
-
-Anything beyond the above is currently out of scope.
-
-=head1 METHODS
-
-=head2 new
-
-  my $template = Dancer2::Template::Implementation::ForkedTiny->new(
-      TRIM => 1,
-  );
-
-The C<new> constructor is provided for compatibility with Template Toolkit.
-
-The only parameter it currently supports is C<TRIM> (which removes leading
-and trailing whitespace from processed templates).
-
-Additional parameters can be provided without error, but will be ignored.
-
-=head2 process
-
-  # DEPRECATED: Return template results (emits a warning)
-  my $text = $template->process( \$input, $vars );
-
-  # Print template results to STDOUT
-  $template->process( \$input, $vars );
-
-  # Generate template results into a variable
-  my $output = '';
-  $template->process( \$input, $vars, \$output );
-
-The C<process> method is called to process a template.
-
-The first parameter is a reference to a text string containing the template
-text. A reference to a hash may be passed as the second parameter containing
-definitions of template variables.
-
-If a third parameter is provided, it must be a scalar reference to be
-populated with the output of the template.
-
-For a limited amount of time, the old deprecated interface will continue to
-be supported. If C<process> is called without a third parameter, and in
-scalar or list contest, the template results will be returned to the caller.
-
-If C<process> is called without a third parameter, and in void context, the
-template results will be C<print()>ed to the currently selected file handle
-(probably C<STDOUT>) for compatibility with L<Template>.
-
-=head1 SUPPORT
-
-Bugs should be reported via the CPAN bug tracker at
-
-L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Template-Tiny>
-
-For other issues, or commercial enhancement or support, contact the author.
-
-=head1 AUTHOR
-
-Adam Kennedy E<lt>adamk@cpan.orgE<gt>
-
-Forked and improved by Damien Krotkine E<lt>dams@cpan.orgE<gt>
-
-=head1 SEE ALSO
-
-L<Config::Tiny>, L<CSS::Tiny>, L<YAML::Tiny>
-
-=head1 COPYRIGHT
-
-Copyright 2009 - 2011 Adam Kennedy.
-Copyright 2012 Damien Krotkine.
-
-This program is free software; you can redistribute
-it and/or modify it under the same terms as Perl itself.
-
-The full text of the license can be found in the
-LICENSE file included with this module.
-
-=cut
diff --git a/lib/Dancer2/Template/Tiny.pm b/lib/Dancer2/Template/Tiny.pm
index e85d764ce..bd9952eae 100644
--- a/lib/Dancer2/Template/Tiny.pm
+++ b/lib/Dancer2/Template/Tiny.pm
@@ -4,17 +4,17 @@ package Dancer2::Template::Tiny;
 use Moo;
 use Carp qw/croak/;
 use Dancer2::Core::Types;
-use Dancer2::Template::Implementation::ForkedTiny;
+use Template::Tiny;
 use Dancer2::FileUtils 'read_file_content';
 
 with 'Dancer2::Core::Role::Template';
 
 has '+engine' => (
-    isa => InstanceOf ['Dancer2::Template::Implementation::ForkedTiny']
+    isa => InstanceOf ['Template::Tiny']
 );
 
 sub _build_engine {
-    Dancer2::Template::Implementation::ForkedTiny->new( %{ $_[0]->config } );
+    Template::Tiny->new( %{ $_[0]->config } );
 }
 
 sub render {
@@ -28,6 +28,10 @@ sub render {
       ? ${$template}
       : read_file_content($template);
 
+    # Template::Tiny doesn't like empty template files (like .dancer), so
+    # don't try to render them. Return an empty (not undef) value instead.
+    return '' unless $template_data;
+
     my $content;
 
     $self->engine->process( \$template_data, $tokens, \$content, )
@@ -45,25 +49,14 @@ __END__
 This template engine allows you to use L<Template::Tiny> in L<Dancer2>.
 
 L<Template::Tiny> is an implementation of a subset of L<Template::Toolkit> (the
-major parts) which takes much less memory and is faster. If you're only using
+major parts) but takes much less memory and is faster. If you're only using
 the main functions of Template::Toolkit, you could use Template::Tiny. You can
 also seamlessly move back to Template::Toolkit whenever you want.
 
-However, Dancer2 uses a modified version of L<Template::Tiny>, which is L<Dancer2::Template::Implementation::ForkedTiny>. It adds 2 features :
-
-=over
-
-=item *
-
-opening and closing tag are now configurable
-
-=item *
-
-CodeRefs are evaluated and their results is inserted in the result.
-
-=back
-
-You can read more on L<Dancer2::Template::Implementation::ForkedTiny>.
+Dancer2 maintained a fork of L<Template::Tiny> for some time that added
+several features missing in the original module. These have since been
+implemented, and as such, a minimum L<Template::Tiny> version of 1.16 is
+required.
 
 To use this engine, all you need to configure in your L<Dancer2>'s
 C<config.yaml>:
@@ -88,5 +81,4 @@ L<Template::Toolkit> for rendering.
 
 =head1 SEE ALSO
 
-L<Dancer2>, L<Dancer2::Core::Role::Template>, L<Template::Tiny>,
-L<Dancer2::Template::Implementation::ForkedTiny>.
+L<Dancer2>, L<Dancer2::Core::Role::Template>, L<Template::Tiny>.
diff --git a/t/template_tiny/01_compile.t b/t/template_tiny/01_compile.t
deleted file mode 100644
index c167e7e23..000000000
--- a/t/template_tiny/01_compile.t
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-
-BEGIN {
-    $|  = 1;
-    $^W = 1;
-}
-use Test::More tests => 1;
-
-use_ok('Dancer2::Template::Implementation::ForkedTiny');
diff --git a/t/template_tiny/02_trivial.t b/t/template_tiny/02_trivial.t
deleted file mode 100644
index 0c81b6efe..000000000
--- a/t/template_tiny/02_trivial.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-
-BEGIN {
-    $|  = 1;
-    $^W = 1;
-}
-use Test::More tests => 1;
-use Dancer2::Template::Implementation::ForkedTiny ();
-
-sub process {
-    my $stash    = shift;
-    my $input    = shift;
-    my $expected = shift;
-    my $message  = shift || 'Template processed ok';
-    my $output   = '';
-    Dancer2::Template::Implementation::ForkedTiny->new->process(
-        \$input,
-        $stash, \$output
-    );
-    is( $output, $expected, $message );
-}
-
-
-######################################################################
-# Main Tests
-
-process( { foo => 'World' },
-    <<'END_TEMPLATE', <<'END_EXPECTED', 'Trivial ok' );
-Hello [% foo %]!
-END_TEMPLATE
-Hello World!
-END_EXPECTED
diff --git a/t/template_tiny/03_samples.t b/t/template_tiny/03_samples.t
deleted file mode 100644
index 30a8c66cb..000000000
--- a/t/template_tiny/03_samples.t
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-
-BEGIN {
-    $|  = 1;
-    $^W = 1;
-}
-use vars qw{$VAR1 $VAR2};
-use Test::More;
-use File::Spec::Functions ':ALL';
-use Dancer2::Template::Implementation::ForkedTiny ();
-use FindBin qw($Bin);
-use Ref::Util qw<is_hashref>;
-
-my $SAMPLES = catdir( $Bin, 'samples' );
-unless ( -d $SAMPLES ) {
-    die("Failed to find samples directory");
-}
-
-opendir( DIR, $SAMPLES ) or die("opendir($SAMPLES): $!");
-my @TEMPLATES = sort grep {/\.tt$/} readdir(DIR);
-closedir(DIR) or die("closedir($SAMPLES): $!");
-
-plan( tests => scalar(@TEMPLATES) * 6 );
-
-# Test the test classes
-#SCOPE: {
-#    my $false = bless { }, 'False';
-#    my $string = $false . '';
-#    is( $string, 'Hello', 'False objects return ok as a string' );
-#    is( !!$false, '', 'False objects returns false during bool' );
-#}
-
-
-######################################################################
-# Main Tests
-
-foreach my $template (@TEMPLATES) {
-    $template =~ s/\.tt$//;
-    my $file     = catfile( $SAMPLES, $template );
-    my $tt_file  = "$file.tt";
-    my $var_file = "$file.var";
-    my $txt_file = "$file.txt";
-    ok( -f $tt_file,  "$template: Found $tt_file" );
-    ok( -f $txt_file, "$template: Found $txt_file" );
-    ok( -f $var_file, "$template: Found $var_file" );
-
-    # Load the resources
-    my $tt  = slurp($tt_file);
-    my $var = slurp($var_file);
-    my $txt = slurp($txt_file);
-    eval $var;
-    die $@ if $@;
-    ok( is_hashref($VAR1), "$template: Loaded stash from file" );
-
-    # Create the processor normally
-    my %params = ( INCLUDE_PATH => $SAMPLES, );
-    %params = ( %params, %$VAR2 ) if $VAR2;
-    my $template = Dancer2::Template::Implementation::ForkedTiny->new(%params);
-    isa_ok( $template, 'Dancer2::Template::Implementation::ForkedTiny' );
-
-    # Execute the template
-    $template->process( \$tt, $VAR1, \my $out );
-    is( $out, $txt, "$template: Output matches expected" );
-}
-
-sub slurp {
-    my $f = shift;
-    local $/ = undef;
-    open( VAR, $f ) or die("open($f): $!");
-    my $buffer = <VAR>;
-    close VAR;
-    return $buffer;
-}
-
-
-######################################################################
-# Support Classes for object tests
-
-SCOPE: {
-
-    package UpperCase;
-
-    sub foo {
-        uc $_[0]->{foo};
-    }
-
-    1;
-}
-
-SCOPE: {
-
-    package False;
-
-    use overload 'bool' => sub {0};
-    use overload '""'   => sub {'Hello'};
-
-    1;
-}
-
-SCOPE: {
-
-    package Private;
-
-    sub public   {'foo'}
-    sub _private {'foo'}
-
-    1;
-}
diff --git a/t/template_tiny/04_compat.t b/t/template_tiny/04_compat.t
deleted file mode 100644
index b81cc992b..000000000
--- a/t/template_tiny/04_compat.t
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-
-BEGIN {
-    $|  = 1;
-    $^W = 1;
-}
-use vars qw{$VAR1 $VAR2};
-use Test::More;
-use File::Spec::Functions ':ALL';
-eval "require Template";
-if ($@) {
-    plan( skip_all => 'Template Toolkit is not installed' );
-}
-use Ref::Util qw<is_hashref>;
-use FindBin qw($Bin);
-my $SAMPLES = catdir( $Bin, 'samples' );
-unless ( -d $SAMPLES ) {
-    die("Failed to find samples directory");
-}
-
-opendir( DIR, $SAMPLES ) or die("opendir($SAMPLES): $!");
-my @TEMPLATES = sort grep {/\.tt$/} readdir(DIR);
-closedir(DIR) or die("closedir($SAMPLES): $!");
-
-plan( tests => scalar(@TEMPLATES) * 7 );
-
-
-######################################################################
-# Main Tests
-
-foreach my $name (@TEMPLATES) {
-    $name =~ s/\.tt$//;
-    my $file     = catfile( $SAMPLES, $name );
-    my $tt_file  = "$file.tt";
-    my $var_file = "$file.var";
-    my $txt_file = "$file.txt";
-    ok( -f $tt_file,  "$name: Found $tt_file" );
-    ok( -f $txt_file, "$name: Found $txt_file" );
-    ok( -f $var_file, "$name: Found $var_file" );
-
-    # Load the resources
-    my $tt  = slurp($tt_file);
-    my $var = slurp($var_file);
-    my $txt = slurp($txt_file);
-    eval $var;
-    die $@ if $@;
-    ok( is_hashref($VAR1), "$name: Loaded stash from file" );
-
-    # Create the template processor
-    my %params = ( INCLUDE_PATH => $SAMPLES, );
-    %params = ( %params, %$VAR2 ) if $VAR2;
-    my $template = Template->new(%params);
-    isa_ok( $template, 'Template' );
-
-    # Execute the template
-    my $out = '';
-    ok( $template->process( \$tt, $VAR1, \$out ),
-        "$name: ->process returns true"
-    );
-    is( $out, $txt, "$name: Output matches expected" );
-}
-
-sub slurp {
-    my $f = shift;
-    local $/ = undef;
-    open( VAR, $f ) or die("open($f): $!");
-    my $buffer = <VAR>;
-    close VAR;
-    return $buffer;
-}
-
-
-######################################################################
-# Support Classes for object tests
-
-SCOPE: {
-
-    package UpperCase;
-
-    sub foo {
-        uc $_[0]->{foo};
-    }
-
-    1;
-}
-
-SCOPE: {
-
-    package False;
-
-    use overload 'bool' => sub {0};
-    use overload '""'   => sub {'Hello'};
-
-    1;
-}
-
-SCOPE: {
-
-    package Private;
-
-    sub public   {'foo'}
-    sub _private {'foo'}
-
-    1;
-}
diff --git a/t/template_tiny/05_preparse.t b/t/template_tiny/05_preparse.t
deleted file mode 100644
index 51c2c36cf..000000000
--- a/t/template_tiny/05_preparse.t
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-
-BEGIN {
-    $|  = 1;
-    $^W = 1;
-}
-use Test::More tests => 6;
-use Dancer2::Template::Implementation::ForkedTiny ();
-
-sub preprocess {
-    my $template = $_[0];
-    my $expected = $_[1];
-    my $message  = $_[2] || 'Template preprocessd ok';
-    my $prepared =
-      Dancer2::Template::Implementation::ForkedTiny->new->preprocess(
-        $template);
-    is( $prepared, $expected, $message );
-    is( $template, $_[0],
-        '->proprocess does not modify original template variable'
-    );
-}
-
-
-######################################################################
-# Main Tests
-
-preprocess( <<'END_TEMPLATE', <<'END_EXPECTED', 'Simple IF' );
-foo
-[% IF foo %]
-foobar
-[% END %]
-bar
-END_TEMPLATE
-foo
-[% I1 foo %]
-foobar
-[% I1 %]
-bar
-END_EXPECTED
-
-preprocess( <<'END_TEMPLATE', <<'END_EXPECTED', 'Simple UNLESS' );
-foo
-[% UNLESS foo %]
-foobar
-[% END %]
-bar
-END_TEMPLATE
-foo
-[% U1 foo %]
-foobar
-[% U1 %]
-bar
-END_EXPECTED
-
-preprocess( <<'END_TEMPLATE', <<'END_EXPECTED', 'Simple FOREACH' );
-foo
-[% FOREACH element IN lists %]
-foobar
-[% END %]
-bar
-END_TEMPLATE
-foo
-[% F1 element IN lists %]
-foobar
-[% F1 %]
-bar
-END_EXPECTED
diff --git a/t/template_tiny/samples/01_hello.tt b/t/template_tiny/samples/01_hello.tt
deleted file mode 100644
index e91b52887..000000000
--- a/t/template_tiny/samples/01_hello.tt
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello [% foo %]!
-Hello [%foo%]!
-Hello [%   foo   %]!
-Hello [%
-foo
-%]!
-Hello
-[% foo %]!
diff --git a/t/template_tiny/samples/01_hello.txt b/t/template_tiny/samples/01_hello.txt
deleted file mode 100644
index 831dc24b8..000000000
--- a/t/template_tiny/samples/01_hello.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Hello World!
-Hello World!
-Hello World!
-Hello World!
-Hello
-World!
diff --git a/t/template_tiny/samples/01_hello.var b/t/template_tiny/samples/01_hello.var
deleted file mode 100644
index ebf5ab24b..000000000
--- a/t/template_tiny/samples/01_hello.var
+++ /dev/null
@@ -1,3 +0,0 @@
-$VAR1 = {
-          'foo' => 'World'
-        };
diff --git a/t/template_tiny/samples/02_null.tt b/t/template_tiny/samples/02_null.tt
deleted file mode 100644
index a068237bd..000000000
--- a/t/template_tiny/samples/02_null.tt
+++ /dev/null
@@ -1 +0,0 @@
-a[% foo %]b[% bar %]c[% foo %]d
diff --git a/t/template_tiny/samples/02_null.txt b/t/template_tiny/samples/02_null.txt
deleted file mode 100644
index acbe86c7c..000000000
--- a/t/template_tiny/samples/02_null.txt
+++ /dev/null
@@ -1 +0,0 @@
-abcd
diff --git a/t/template_tiny/samples/02_null.var b/t/template_tiny/samples/02_null.var
deleted file mode 100644
index d41ea8c5e..000000000
--- a/t/template_tiny/samples/02_null.var
+++ /dev/null
@@ -1,3 +0,0 @@
-$VAR1 = {
-        'foo' => '',
-        };
diff --git a/t/template_tiny/samples/03_chomp.tt b/t/template_tiny/samples/03_chomp.tt
deleted file mode 100644
index 07fe097ea..000000000
--- a/t/template_tiny/samples/03_chomp.tt
+++ /dev/null
@@ -1,16 +0,0 @@
-foo[%- a -%]bar
-foo [%- a -%] bar
-foo
-[% a %]
-bar
-foo
-
- [%- a %]
-bar
-foo
-[% a -%]
-
- bar
-foo
-[%- a -%]
-bar
diff --git a/t/template_tiny/samples/03_chomp.txt b/t/template_tiny/samples/03_chomp.txt
deleted file mode 100644
index 030b3ffb7..000000000
--- a/t/template_tiny/samples/03_chomp.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-foobar
-foo  bar
-foo
-
-bar
-foo
-
-bar
-foo
-
- bar
-foobar
diff --git a/t/template_tiny/samples/03_chomp.var b/t/template_tiny/samples/03_chomp.var
deleted file mode 100644
index 90f61a9c1..000000000
--- a/t/template_tiny/samples/03_chomp.var
+++ /dev/null
@@ -1 +0,0 @@
-$VAR1 = { };
diff --git a/t/template_tiny/samples/04_nested.tt b/t/template_tiny/samples/04_nested.tt
deleted file mode 100644
index ca17d502c..000000000
--- a/t/template_tiny/samples/04_nested.tt
+++ /dev/null
@@ -1,9 +0,0 @@
-[% a            %]
-[% foo.one      %]
-[% foo.two      %]
-[% foo.three.0  %]
-[% foo.three.1  %]
-[% foo.three.2  %]
-[% foo._private %]
-[% bar.0.foo    %]
-[% bar.bad      %]
diff --git a/t/template_tiny/samples/04_nested.txt b/t/template_tiny/samples/04_nested.txt
deleted file mode 100644
index e82d24141..000000000
--- a/t/template_tiny/samples/04_nested.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-b
-1
-2
-1
-4
-9
-
-bar
-
diff --git a/t/template_tiny/samples/04_nested.var b/t/template_tiny/samples/04_nested.var
deleted file mode 100644
index 633b42bc2..000000000
--- a/t/template_tiny/samples/04_nested.var
+++ /dev/null
@@ -1,14 +0,0 @@
-$VAR1 = {
-    a   => 'b',
-    foo => {
-        one      => 1,
-        two      => 2,
-        three    => [ 1, 4, 9 ],
-        _private => 'secret',
-    },
-    bar => [
-        {
-            foo => 'bar',
-        },
-    ],
-};
diff --git a/t/template_tiny/samples/05_condition.tt b/t/template_tiny/samples/05_condition.tt
deleted file mode 100644
index 2a74d0918..000000000
--- a/t/template_tiny/samples/05_condition.tt
+++ /dev/null
@@ -1,14 +0,0 @@
- [%- IF foo %]World[% END %]!
-Hello[% IF bar %] World[% END %]!
-Hello[% UNLESS foo %] World[% END %]!
-Hello[% UNLESS bar %] World[% END %]!
-[% IF foo -%]
-foo
-[%- ELSE -%]
-bar
-[%- END -%]
-[% IF bar %]
-BAR
-[% ELSE %]
-FOO
-[% END -%]
diff --git a/t/template_tiny/samples/05_condition.txt b/t/template_tiny/samples/05_condition.txt
deleted file mode 100644
index 7b9a9511c..000000000
--- a/t/template_tiny/samples/05_condition.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-World!
-Hello!
-Hello!
-Hello World!
-foo
-FOO
diff --git a/t/template_tiny/samples/05_condition.var b/t/template_tiny/samples/05_condition.var
deleted file mode 100644
index b07e48024..000000000
--- a/t/template_tiny/samples/05_condition.var
+++ /dev/null
@@ -1,4 +0,0 @@
-$VAR1 = {
-          'foo' => 1,
-          'bar' => 0,
-        };
diff --git a/t/template_tiny/samples/06_object.tt b/t/template_tiny/samples/06_object.tt
deleted file mode 100644
index 371c535e6..000000000
--- a/t/template_tiny/samples/06_object.tt
+++ /dev/null
@@ -1,5 +0,0 @@
-[% foo.foo %]
-[% bar %]
-[% IF bar %]true[% ELSE %]false[% END %]
-public  = '[% baz.public   %]'
-private = '[% baz._private %]'
diff --git a/t/template_tiny/samples/06_object.txt b/t/template_tiny/samples/06_object.txt
deleted file mode 100644
index dc6217329..000000000
--- a/t/template_tiny/samples/06_object.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-BAR
-Hello
-false
-public  = 'foo'
-private = ''
diff --git a/t/template_tiny/samples/06_object.var b/t/template_tiny/samples/06_object.var
deleted file mode 100644
index 22cfc77be..000000000
--- a/t/template_tiny/samples/06_object.var
+++ /dev/null
@@ -1,5 +0,0 @@
-$VAR1 = {
-    foo => bless( { foo => 'bar' }, 'UpperCase' ),
-    bar => bless( {              }, 'False'     ),
-    baz => bless( {              }, 'Private'   ),
-};
diff --git a/t/template_tiny/samples/07_nesting.tt b/t/template_tiny/samples/07_nesting.tt
deleted file mode 100644
index 4142817f3..000000000
--- a/t/template_tiny/samples/07_nesting.tt
+++ /dev/null
@@ -1,20 +0,0 @@
-[% IF true %]
-  one
-[% END %]
-[% IF false %]
-  two
-[% END %]
-[% IF true %]
-  [% IF true %]
-    three
-  [% END %]
-  [% IF false %]
-    four
-  [% END %]
-[% END %]
-[% IF true %]
-  five
-[% END %]
-[% IF false %]
-  six
-[% END %]
\ No newline at end of file
diff --git a/t/template_tiny/samples/07_nesting.txt b/t/template_tiny/samples/07_nesting.txt
deleted file mode 100644
index a040bd9db..000000000
--- a/t/template_tiny/samples/07_nesting.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  one
-
-
-
-  
-    three
-  
-  
-
-
-  five
-
diff --git a/t/template_tiny/samples/07_nesting.var b/t/template_tiny/samples/07_nesting.var
deleted file mode 100644
index 351e95ba3..000000000
--- a/t/template_tiny/samples/07_nesting.var
+++ /dev/null
@@ -1,4 +0,0 @@
-$VAR1 = {
-    true  => 1,
-    false => 0,
-};
diff --git a/t/template_tiny/samples/08_foreach.tt b/t/template_tiny/samples/08_foreach.tt
deleted file mode 100644
index c186586e7..000000000
--- a/t/template_tiny/samples/08_foreach.tt
+++ /dev/null
@@ -1,11 +0,0 @@
-People [% foo %]:
-[% FOREACH item IN list %]
-[%- item.name %] <[% item.email %]>
-[% END -%]
-Cool People:
-[% FOREACH item IN list %]
-[%- IF item.cool %]
-[%- item.name %]
-[% END %]
-[%- END -%]
-Done!
diff --git a/t/template_tiny/samples/08_foreach.txt b/t/template_tiny/samples/08_foreach.txt
deleted file mode 100644
index f246254f1..000000000
--- a/t/template_tiny/samples/08_foreach.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-People bar:
-Adam Kennedy <adamk@cpan.org>
-Foo <No Fixed Address>
-Cool People:
-Adam Kennedy
-Done!
diff --git a/t/template_tiny/samples/08_foreach.var b/t/template_tiny/samples/08_foreach.var
deleted file mode 100644
index 94db524ee..000000000
--- a/t/template_tiny/samples/08_foreach.var
+++ /dev/null
@@ -1,15 +0,0 @@
-$VAR1 = {
-    foo  => 'bar',
-    list => [
-        {
-            name  => 'Adam Kennedy',
-            email => 'adamk@cpan.org',
-            cool  => 1,
-        },
-        {
-            name  => 'Foo',
-            email => 'No Fixed Address',
-            cool  => 0,
-        },
-    ],
-};
diff --git a/t/template_tiny/samples/09_trim.tt b/t/template_tiny/samples/09_trim.tt
deleted file mode 100644
index 8862e04f6..000000000
--- a/t/template_tiny/samples/09_trim.tt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Hello World!
diff --git a/t/template_tiny/samples/09_trim.txt b/t/template_tiny/samples/09_trim.txt
deleted file mode 100644
index c57eff55e..000000000
--- a/t/template_tiny/samples/09_trim.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello World!
\ No newline at end of file
diff --git a/t/template_tiny/samples/09_trim.var b/t/template_tiny/samples/09_trim.var
deleted file mode 100644
index ebe3396b1..000000000
--- a/t/template_tiny/samples/09_trim.var
+++ /dev/null
@@ -1,2 +0,0 @@
-$VAR1 = {};
-$VAR2 = { TRIM => 1 };