diff --git a/t/human.t b/t/human.t
index 86bf1d5..7b22ca5 100644
--- a/t/human.t
+++ b/t/human.t
@@ -100,5 +100,4 @@ subtest 'Flagging remark', sub {
         ->header_like(Location => qr{human/remark/flag/1});
 };
 
-
 done_testing;
diff --git a/t/post.t b/t/post.t
new file mode 100644
index 0000000..e6166a5
--- /dev/null
+++ b/t/post.t
@@ -0,0 +1,110 @@
+use Mojo::Base -strict;
+use Test::More;
+use Test::Mojo;
+
+my $t = Test::Mojo->new('PostText');
+
+# For CAPTCHA
+my %good_captcha    = (answer => 1, number => 'Ⅰ');
+my $bump_thread_url =
+    '/captcha/H4sIAImTzmQAA8soKSmw0tfPyU9OzMnILy6xMjYwMNDPKM1NzNMvyShKTUzRTyrNLdA3BAD5ek7T%0AKQAAAA==%0A';
+
+my %valid_thread = (
+    author => 'Anonymous',
+    title  => 'hi',
+    body   => 'ayy... lmao'
+    );
+
+my %invalid_title = (
+    author => 'Anonymous',
+    title  => '',
+    body   => 'ayy... lmao'
+    );
+
+my %invalid_thread = (
+    author => 'Anonymous',
+    title  => 'hi',
+    body   => 'a'
+    );
+
+my %valid_remark = (
+    author => 'Anonymous',
+    body   => 'hi'
+    );
+
+my %invalid_remark = (
+    author => 'Anonymous',
+    body   => 'a'
+    );
+
+# Do CAPTCHA
+$t->post_ok($bump_thread_url, form => \%good_captcha)
+    ->status_is(302)
+    ->header_like(Location => qr{human/thread/bump/1});
+
+$t->ua->max_redirects(1);
+
+subtest 'Post new thread', sub {
+    # GET
+    $t->get_ok('/human/thread/post')->status_is(200)
+        ->element_exists('form input[name="author"]' )
+        ->element_exists('form input[name="title"]'  )
+        ->element_exists('form textarea[name="body"]')
+        ->element_exists('form button[type="submit"]' )
+        ->text_like(h2 => qr/New Thread/);
+
+    # POST
+    $t->post_ok('/human/thread/post')->status_is(200)
+        ->element_exists('form input[name="author"]' )
+        ->element_exists('form input[name="title"]'  )
+        ->element_exists('form textarea[name="body"]')
+        ->element_exists('form button[type="submit"]' )
+        ->text_like(h2 => qr/New Thread/);
+
+    $t->post_ok('/human/thread/post', form => \%invalid_title)
+        ->status_is(400)
+        ->text_like(p => qr/Must be between/);
+
+    $t->post_ok('/human/thread/post', form => \%invalid_thread)
+        ->status_is(400)
+        ->text_like(p => qr/Must be between/);
+
+    $t->post_ok('/human/thread/post', form => \%valid_thread)
+        ->status_is(200)
+        ->text_like(h2 => qr/Thread #\d+/);
+};
+
+subtest 'Post new remark', sub {
+    # GET
+    $t->get_ok('/human/remark/post/1')->status_is(200)
+        ->element_exists('form input[name="author"]' )
+        ->element_exists('form textarea[name="body"]')
+        ->element_exists('form button[type="submit"]' )
+        ->text_like(h2 => qr/Remark on Thread #/);
+    $t->get_ok('/human/remark/post/65536')->status_is(404)
+        ->text_like(p => qr/Thread not found/);
+    # Test the remark-to-remark thing
+    $t->get_ok('/human/remark/post/1/1')->status_is(200)
+        ->element_exists('form input[name="author"]' )
+        ->element_exists('form textarea[name="body"]')
+        ->element_exists('form button[type="submit"]' )
+        ->element_exists('a[href$="/remark/single/1"]')
+        ->text_like(h3 => qr/Last Remark/);
+
+    # POST
+    $t->post_ok('/human/remark/post/1')->status_is(200)
+        ->element_exists('form input[name="author"]' )
+        ->element_exists('form textarea[name="body"]')
+        ->element_exists('form button[type="submit"]' )
+        ->text_like(h2 => qr/Remark on Thread #/);
+
+    $t->post_ok('/human/remark/post/1', form => \%valid_remark)
+        ->status_is(200)
+        ->text_like(h2 => qr/Thread #1/);
+
+    $t->post_ok('/human/remark/post/1', form => \%invalid_remark)
+        ->status_is(400)
+        ->text_like(p => qr/Must be between/);
+};
+
+done_testing;
diff --git a/t/remark.t b/t/remark.t
index 67a2bf9..f6f23af 100644
--- a/t/remark.t
+++ b/t/remark.t
@@ -4,16 +4,6 @@ use Test::Mojo;
 
 my $t = Test::Mojo->new('PostText');
 
-my %valid_remark = (
-    author => 'Anonymous',
-    body   => 'hi'
-    );
-
-my %invalid_remark = (
-    author => 'Anonymous',
-    body   => 'a'
-    );
-
 subtest 'View single remark', sub {
     $t->get_ok('/remark/single/1')->status_is(200)
         ->text_like(h2 => qr/Remark #1/)
@@ -33,37 +23,4 @@ subtest 'Remarks feed', sub {
         ->content_type_is('application/rss+xml')
 };
 
-$t->ua->max_redirects(1);
-
-subtest 'Post new remark', sub {
-    # GET
-    $t->get_ok('/remark/post/1')->status_is(200)
-        ->element_exists('form input[name="author"]' )
-        ->element_exists('form textarea[name="body"]')
-        ->element_exists('form button[type="submit"]' )
-        ->text_like(h2 => qr/Remark on Thread #/);
-    $t->get_ok('/remark/post/65536')->status_is(404)
-        ->text_like(p => qr/Thread not found/);
-    # Test the remark-to-remark thing
-    $t->get_ok('/remark/post/1/1')->status_is(200)
-        ->element_exists('form input[name="author"]' )
-        ->element_exists('form textarea[name="body"]')
-        ->element_exists('form button[type="submit"]' )
-        ->element_exists('a[href$="/remark/single/1"]')
-        ->text_like(h3 => qr/Last Remark/);
-
-    # POST
-    $t->post_ok('/remark/post/1')->status_is(200)
-        ->element_exists('form input[name="author"]' )
-        ->element_exists('form textarea[name="body"]')
-        ->element_exists('form button[type="submit"]' )
-        ->text_like(h2 => qr/Remark on Thread #/);
-
-    $t->post_ok('/remark/post/1', form => \%valid_remark)->status_is(200)
-        ->text_like(h2 => qr/Thread #1/);
-
-    $t->post_ok('/remark/post/1', form => \%invalid_remark)->status_is(400)
-        ->text_like(p => qr/Must be between/);
-};
-
 done_testing;
diff --git a/t/thread.t b/t/thread.t
index 7debe82..9376253 100644
--- a/t/thread.t
+++ b/t/thread.t
@@ -4,24 +4,6 @@ use Test::Mojo;
 
 my $t = Test::Mojo->new('PostText');
 
-my %valid_params = (
-    author => 'Anonymous',
-    title  => 'hi',
-    body   => 'ayy... lmao'
-    );
-
-my %invalid_title = (
-    author => 'Anonymous',
-    title  => '',
-    body   => 'ayy... lmao'
-    );
-
-my %invalid_post = (
-    author => 'Anonymous',
-    title  => 'hi',
-    body   => 'a'
-    );
-
 subtest 'List threads by page', sub {
     $t->get_ok('/thread/list')->status_is(200)
         ->text_like(h2 => qr/Threads List/);
@@ -58,33 +40,4 @@ subtest 'Threads feed', sub {
         ->content_type_is('application/rss+xml')
 };
 
-$t->ua->max_redirects(1);
-
-subtest 'Post new thread', sub {
-    # GET
-    $t->get_ok('/thread/post')->status_is(200)
-        ->element_exists('form input[name="author"]' )
-        ->element_exists('form input[name="title"]'  )
-        ->element_exists('form textarea[name="body"]')
-        ->element_exists('form button[type="submit"]' )
-        ->text_like(h2 => qr/New Thread/);
-
-    # POST
-    $t->post_ok('/thread/post')->status_is(200)
-        ->element_exists('form input[name="author"]' )
-        ->element_exists('form input[name="title"]'  )
-        ->element_exists('form textarea[name="body"]')
-        ->element_exists('form button[type="submit"]' )
-        ->text_like(h2 => qr/New Thread/);
-
-    $t->post_ok('/thread/post', form => \%invalid_title)->status_is(400)
-        ->text_like(p => qr/Must be between/);
-
-    $t->post_ok('/thread/post', form => \%invalid_post)->status_is(400)
-        ->text_like(p => qr/Must be between/);
-
-    $t->post_ok('/thread/post', form => \%valid_params)->status_is(200)
-        ->text_like(h2 => qr/Thread #\d+/);
-};
-
 done_testing;