diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm
index 190063b..b8131eb 100644
--- a/lib/Travelynx/Command/database.pm
+++ b/lib/Travelynx/Command/database.pm
@@ -187,8 +187,6 @@ sub run {
 	else {
 		$self->help;
 	}
-
-	$dbh->disconnect;
 }
 
 1;
diff --git a/t/02-registration.t b/t/02-registration.t
new file mode 100644
index 0000000..b8fb51e
--- /dev/null
+++ b/t/02-registration.t
@@ -0,0 +1,90 @@
+#!/usr/bin/env perl
+use Mojo::Base -strict;
+
+# Tests the standard registration -> verification -> successful login flow
+
+use Test::More;
+use Test::Mojo;
+
+# Include application
+use FindBin;
+require "$FindBin::Bin/../index.pl";
+
+my $t = Test::Mojo->new('Travelynx');
+
+$t->app->pg->db->query('drop schema if exists travelynx_test_02 cascade');
+$t->app->pg->db->query('create schema travelynx_test_02');
+$t->app->pg->db->query('set search_path to travelynx_test_02');
+$t->app->dbh->do('set search_path to travelynx_test_02');
+$t->app->pg->on(
+	connection => sub {
+		my ( $pg, $dbh ) = @_;
+		$dbh->do('set search_path to travelynx_test_02');
+	}
+);
+
+$t->app->config->{mail}->{disabled} = 1;
+
+$t->app->start( 'database', 'migrate' );
+
+my $csrf_token
+  = $t->ua->get('/register')->res->dom->at('input[name=csrf_token]')
+  ->attr('value');
+
+# Successful registration
+$t->post_ok(
+	'/register' => form => {
+		csrf_token => $csrf_token,
+		user       => 'someone',
+		email      => 'foo@example.org',
+		password   => 'foofoofoo',
+		password2  => 'foofoofoo',
+	}
+);
+$t->status_is(200)->content_like(qr{Verifizierungslink});
+
+# Failed registration (user name not available)
+$t->post_ok(
+	'/register' => form => {
+		csrf_token => $csrf_token,
+		user       => 'someone',
+		email      => 'foo@example.org',
+		password   => 'foofoofoo',
+		password2  => 'foofoofoo',
+	}
+);
+$t->status_is(200)->content_like(qr{Name bereits vergeben});
+
+$csrf_token = $t->ua->get('/login')->res->dom->at('input[name=csrf_token]')
+  ->attr('value');
+
+# Failed login (not verified yet)
+$t->post_ok(
+	'/login' => form => {
+		csrf_token => $csrf_token,
+		user       => 'someone',
+		password   => 'foofoofoo',
+	}
+);
+$t->status_is(200)->content_like(qr{nicht freigeschaltet});
+
+my $res = $t->app->pg->db->select( 'users', [ 'id', 'token' ],
+	{ name => 'someone' } );
+my ( $uid, $token ) = @{ $res->hash }{qw{id token}};
+
+# Successful verification
+$t->get_ok("/reg/${uid}/${token}");
+$t->status_is(200)->content_like(qr{freigeschaltet});
+
+# Successful login
+$t->post_ok(
+	'/login' => form => {
+		csrf_token => $csrf_token,
+		user       => 'someone',
+		password   => 'foofoofoo',
+	}
+);
+$t->status_is(302)->header_is( location => '/' );
+
+$t->app->pg->db->query('drop schema travelynx_test_02 cascade');
+done_testing();