diff --git a/cypress/integration/article.test.js b/cypress/integration/article.test.js
index e3bea9c..c2dea6c 100644
--- a/cypress/integration/article.test.js
+++ b/cypress/integration/article.test.js
@@ -2,20 +2,18 @@ import { ROUTES } from '../constants'
 
 describe('Article', () => {
   beforeEach(() => {
-    cy.intercept('GET', /articles\/\S+$/, { fixture: 'article.json' })
-    cy.intercept('GET', /articles\?/, { fixture: 'articles.json' })
-    cy.intercept('GET', /tags$/, { fixture: 'articles_of_tag.json' })
-    cy.intercept('GET', /profiles\/\S+/, { fixture: 'profile.json' })
-    cy.intercept('DELETE', /articles\/\S+$/, { statusCode: 200, body: {} }).as('deleteArticle')
+    cy.intercept('GET', /articles\?limit/, { fixture: 'articles.json' })
+    cy.intercept('GET', /articles\/.+/, { fixture: 'article.json' })
+    cy.intercept('GET', /tags/, { fixture: 'articles_of_tag.json' })
+    cy.intercept('GET', /profiles\/.+/, { fixture: 'profile.json' })
+    cy.intercept('DELETE', /articles\/.+/, { statusCode: 200, body: {} }).as('deleteArticle')
   })
 
   describe('post article', () => {
-    before(() => {
+    it('jump to post detail page when submit create article form', () => {
       cy.login()
       cy.visit('/')
-    })
 
-    it('jump to post detail page when submit create article form', () => {
       cy.intercept('POST', /articles$/, { fixture: 'article.json' })
 
       cy.get('[href="#/article/create"]').click()
@@ -45,12 +43,10 @@ describe('Article', () => {
   })
 
   describe('delete article', () => {
-    before(() => {
+    it('delete article', () => {
       cy.login()
       cy.visit(ROUTES.ARTICLE)
-    })
 
-    it('delete article', () => {
       cy.get('.article-actions button.btn-outline-danger')
         .contains('Delete Article')
         .click()
diff --git a/cypress/integration/home.test.js b/cypress/integration/home.test.js
index 02653ab..69dbb1d 100644
--- a/cypress/integration/home.test.js
+++ b/cypress/integration/home.test.js
@@ -4,12 +4,12 @@ describe('Homepage', () => {
   beforeEach(() => {
     cy.intercept('GET', /articles\?tag=butt/, { fixture: 'articles_of_tag.json' }).as('getArticlesOfTag')
     cy.intercept('GET', /articles\?limit/, { fixture: 'articles.json' }).as('getArticles')
+    cy.intercept('GET', /articles\/.+/, { fixture: 'article.json' }).as('getArticle')
     cy.intercept('GET', /tags/, { fixture: 'tags.json' }).as('getTags')
   })
 
   it('should can access home page', () => {
     cy.visit(ROUTES.HOME)
-    cy.wait('@getArticles')
 
     cy.get('h1.logo-font')
       .should('contain.text', 'conduit')
@@ -38,7 +38,6 @@ describe('Homepage', () => {
 
   it('should highlight Home nav-item top menu bar when page load', () => {
     cy.visit(ROUTES.HOME)
-    cy.wait('@getArticles')
 
     cy.get('ul.nav.navbar-nav.pull-xs-right a.nav-link')
       .contains('Home')