diff --git a/.travis.yml b/.travis.yml
index 365208d..1cdde47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,4 @@ python:
 # command to install dependencies
 install: pip install -r requirements.txt
 # command to run tests
-script: python manage.py test core api
+script: python manage.py test core api pins
diff --git a/pinry/core/templates/core/login.html b/pinry/core/templates/core/login.html
index 6892f64..c8c025a 100644
--- a/pinry/core/templates/core/login.html
+++ b/pinry/core/templates/core/login.html
@@ -11,7 +11,6 @@
             <div id="form" class="span6 offset3">
                 <h1>Login</h1>
                 <form action="{% url core:login %}" method="post" class="form-horizontal">
-                    {% csrf_token %}
                     {% for field in form %}
                         {% bootstrap_field field %}
                     {% endfor %}
diff --git a/pinry/core/templates/core/register.html b/pinry/core/templates/core/register.html
index 68d56e8..0ecab57 100644
--- a/pinry/core/templates/core/register.html
+++ b/pinry/core/templates/core/register.html
@@ -11,7 +11,6 @@
             <div id="form" class="span6 offset3">
                 <h1>Register</h1>
                 <form action="{% url core:register %}" method="post" class="form-horizontal">
-                    {% csrf_token %}
                     {% for field in form %}
                         {% bootstrap_field field %}
                     {% endfor %}
diff --git a/pinry/pins/templates/pins/new_pin.html b/pinry/pins/templates/pins/new_pin.html
index 908e6cc..439eb4c 100644
--- a/pinry/pins/templates/pins/new_pin.html
+++ b/pinry/pins/templates/pins/new_pin.html
@@ -12,7 +12,6 @@
                 <h1>New Pin</h1>
                 {{ form.non_field_errors }}
                 <form enctype="multipart/form-data" action="{% url pins:new-pin %}" method="post" class="form-horizontal">
-                    {% csrf_token %}
                     {% for field in form %}
                         {% bootstrap_field field %}
                     {% endfor %}
diff --git a/pinry/pins/templates/pins/templatetags/new_pin.html b/pinry/pins/templates/pins/templatetags/new_pin.html
index b9b5cbe..835f454 100644
--- a/pinry/pins/templates/pins/templatetags/new_pin.html
+++ b/pinry/pins/templates/pins/templatetags/new_pin.html
@@ -5,9 +5,7 @@
         <h3>New Pin</h3>
     </div>
     <form enctype="multipart/form-data" action="{% url pins:new-pin %}" method="post" class="form-horizontal">
-        {% csrf_token %}
         <div class="modal-body">
-            {% csrf_token %}
             {% for field in form %}
                 {% bootstrap_field field %}
             {% endfor %}
diff --git a/pinry/pins/tests.py b/pinry/pins/tests.py
index 5f7cbb3..a3e2e4a 100644
--- a/pinry/pins/tests.py
+++ b/pinry/pins/tests.py
@@ -33,7 +33,7 @@ class NewPinTest(TestCase):
             'url': 'https://github.com/overshard/pinry/raw/master/'
                    'screenshot.png',
         })
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 200)
 
     def test_new_pin_invalid_protocol(self):
         response = self.client.post(self.url, {
diff --git a/pinry/settings/__init__.py b/pinry/settings/__init__.py
index 2c1755f..6157930 100644
--- a/pinry/settings/__init__.py
+++ b/pinry/settings/__init__.py
@@ -40,7 +40,6 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
     'pinry.core.middleware.Public',
 )
 TEMPLATE_CONTEXT_PROCESSORS = (