diff --git a/.travis.yml b/.travis.yml
index 49f5582..c470e92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,5 +17,16 @@ matrix:
    allow_failures:
        - julia: nightly
 
+jobs:
+    include:
+        - stage: "Documentation"
+          julia: 1.0
+          os: linux
+          script:
+            - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));
+                                                   Pkg.instantiate()'
+            - julia --project=docs/ -e 'import Pkg; Pkg.add("Documenter"); include("docs/make.jl")'
+          after_success: skip
+
 after_success:
     - julia -e 'cd(Pkg.dir("JuliaFEM")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
diff --git a/docs/deploy.jl b/docs/deploy.jl
index 2d5c1d6..df9a90d 100644
--- a/docs/deploy.jl
+++ b/docs/deploy.jl
@@ -5,7 +5,6 @@ using Documenter
 
 deploydocs(
     repo = "github.com/JuliaFEM/JuliaFEM.jl.git",
-    julia = "1.0",
     target = "build",
     deps = nothing,
     make = nothing)
diff --git a/docs/make.jl b/docs/make.jl
index 9a955cf..79abe05 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -254,8 +254,9 @@ PAGES = [
 @info("Pages in documentation", PAGES)
 
 makedocs(modules=[JuliaFEM],
-         format = Documenter.HTML(),
+         format = Documenter.HTML(analytics="UA-83590644-1"),
          checkdocs = :all,
-         sitename = "JuliaFEM",
-         analytics = "UA-83590644-1",
+         sitename = "JuliaFEM.jl",
          pages = PAGES)
+
+include("deploy.jl")
diff --git a/test/runtests.jl b/test/runtests.jl
index 7d4ff3e..eb7a173 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -3,8 +3,6 @@
 
 using JuliaFEM, Test
 
-include("../docs/make.jl")
-
 @testset "JuliaFEM.jl" begin
     @testset "test_dirichlet.jl" begin
         include("test_dirichlet.jl")
@@ -163,5 +161,3 @@ include("../docs/make.jl")
         include("test_von_mises_material.jl")
     end
 end
-
-include("../docs/deploy.jl")