diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index bfd8a11ce93..89b0e1b39e0 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -15,7 +15,11 @@
         You don't have any environments right now.
       %p.blank-state-text
         Environments are places where code gets deployed, such as staging or production.
-      = link_to "Read more", help_page_path("ci", "environments"), class: "btn btn-success"
+        %br
+        = succeed "." do
+          = link_to "Read more about environments", help_page_path("ci", "environments")
+      = link_to new_namespace_project_environment_path(@project.namespace, @project), class: 'btn btn-create' do
+        New environment
   - else
     .table-holder
       %table.table.environments
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index 40fea5211e9..f9e066ade54 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -20,7 +20,7 @@ feature 'Environments', feature: true do
 
     context 'without environments' do
       scenario 'does show no environments' do
-        expect(page).to have_content('No environments to show')
+        expect(page).to have_content('You don\'t have any environments right now.')
       end
     end
 
@@ -33,7 +33,7 @@ feature 'Environments', feature: true do
 
       context 'without deployments' do
         scenario 'does show no deployments' do
-          expect(page).to have_content('No deployments yet')
+          expect(page).to have_content('You don\'t have any deployments right now.')
         end
       end
 
@@ -61,7 +61,7 @@ feature 'Environments', feature: true do
 
     context 'without deployments' do
       scenario 'does show no deployments' do
-        expect(page).to have_content('No deployments for')
+        expect(page).to have_content('You don\'t have any deployments right now.')
       end
     end