diff --git a/tests/app/main/views/test_verify.py b/tests/app/main/views/test_verify.py
index 106c559bd..1d58a3b90 100644
--- a/tests/app/main/views/test_verify.py
+++ b/tests/app/main/views/test_verify.py
@@ -39,23 +39,20 @@ def test_should_redirect_to_add_service_when_code_are_correct(app_,
             assert response.location == url_for('main.add_service', first='first', _external=True)
 
 
-@pytest.mark.xfail(reason='Activation refactor to use api not completed')
-def test_should_activate_user_after_verify(app_, db_, db_session, mock_api_user):
-    with app_.test_request_context():
-        with app_.test_client() as client:
-            with client.session_transaction() as session:
-                session['user_details'] = {'email_address': mock_api_user.email_address, 'id': mock_api_user.id}
-            verify_codes_dao.add_code(user_id=mock_api_user.id, code='12345', code_type='sms')
-            verify_codes_dao.add_code(user_id=mock_api_user.id, code='23456', code_type='email')
-            client.post(url_for('main.verify'),
-                        data={'sms_code': '12345',
-                              'email_code': '23456'})
-
-            after_verify = users_dao.get_user_by_id(user.id)
-            assert after_verify.state == 'active'
+# def test_should_activate_user_after_verify(app_, db_, db_session, mock_api_user, mock_activate_user):
+#     with app_.test_request_context():
+#         with app_.test_client() as client:
+#             with client.session_transaction() as session:
+#                 session['user_details'] = {'email_address': mock_api_user.email_address, 'id': mock_api_user.id}
+#             verify_codes_dao.add_code(user_id=mock_api_user.id, code='12345', code_type='sms')
+#             verify_codes_dao.add_code(user_id=mock_api_user.id, code='23456', code_type='email')
+#             client.post(url_for('main.verify'),
+#                         data={'sms_code': '12345',
+#                               'email_code': '23456'})
+#             assert mock_api_user.state == 'active'
 
 
-def test_should_return_200_when_codes_are_wrong(app_, db_, db_session, mock_api_user):
+def test_should_return_200_when_codes_are_wrong(app_, db_, db_session, mock_api_user, mock_user_dao_get_user):
     with app_.test_request_context():
         with app_.test_client() as client:
             with client.session_transaction() as session:
@@ -71,24 +68,23 @@ def test_should_return_200_when_codes_are_wrong(app_, db_, db_session, mock_api_
             assert resp_data.count('Code does not match') == 2
 
 
-@pytest.mark.xfail(reason='Activation refactor to use api not completed')
-def test_should_mark_all_codes_as_used_when_many_codes_exist(app_,
-                                                             db_,
-                                                             db_session,
-                                                             mock_api_user):
-    with app_.test_request_context():
-        with app_.test_client() as client:
-            with client.session_transaction() as session:
-                session['user_details'] = {'email_address': mock_api_user.email_address, 'id': mock_api_user.id}
-            code1 = verify_codes_dao.add_code(user_id=user.id, code='23345', code_type='sms')
-            code2 = verify_codes_dao.add_code(user_id=user.id, code='98456', code_type='email')
-            code3 = verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms')
-            code4 = verify_codes_dao.add_code(user_id=user.id, code='23412', code_type='email')
-            response = client.post(url_for('main.verify'),
-                                   data={'sms_code': '23345',
-                                         'email_code': '23412'})
-            assert response.status_code == 302
-            assert verify_codes_dao.get_code_by_id(code1).code_used is True
-            assert verify_codes_dao.get_code_by_id(code2).code_used is True
-            assert verify_codes_dao.get_code_by_id(code3).code_used is True
-            assert verify_codes_dao.get_code_by_id(code4).code_used is True
+# def test_should_mark_all_codes_as_used_when_many_codes_exist(app_,
+#                                                              db_,
+#                                                              db_session,
+#                                                              mock_api_user):
+#     with app_.test_request_context():
+#         with app_.test_client() as client:
+#             with client.session_transaction() as session:
+#                 session['user_details'] = {'email_address': mock_api_user.email_address, 'id': mock_api_user.id}
+#             code1 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='23345', code_type='sms')
+#             code2 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='98456', code_type='email')
+#             code3 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='12345', code_type='sms')
+#             code4 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='23412', code_type='email')
+#             response = client.post(url_for('main.verify'),
+#                                    data={'sms_code': '23345',
+#                                          'email_code': '23412'})
+#             assert response.status_code == 302
+#             assert verify_codes_dao.get_code_by_id(code1).code_used is True
+#             assert verify_codes_dao.get_code_by_id(code2).code_used is True
+#             assert verify_codes_dao.get_code_by_id(code3).code_used is True
+#             assert verify_codes_dao.get_code_by_id(code4).code_used is True