diff --git a/core/modules/views/src/Tests/Plugin/ViewsNoResultsBehaviorTest.php b/core/modules/views/src/Tests/Plugin/ViewsNoResultsBehaviorTest.php
index 50610f8..bd7aa6f 100644
--- a/core/modules/views/src/Tests/Plugin/ViewsNoResultsBehaviorTest.php
+++ b/core/modules/views/src/Tests/Plugin/ViewsNoResultsBehaviorTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\views\Tests\ViewTestBase;
+use Drupal\Tests\views\Functional\ViewTestBase;
 
 /**
  * Tests no results behavior.
diff --git a/core/modules/views/templates/views-view.html.twig b/core/modules/views/templates/views-view.html.twig
index b7f50ac..b117240 100644
--- a/core/modules/views/templates/views-view.html.twig
+++ b/core/modules/views/templates/views-view.html.twig
@@ -51,12 +51,11 @@
   {{ exposed }}
   {{ attachment_before }}
 
-  {% if rows %}
+  {% if rows -%}
     {{ rows }}
-  {% elseif empty %}
+  {% elseif empty -%}
     {{ empty }}
   {% endif %}
-
   {{ pager }}
 
   {{ attachment_after }}
diff --git a/core/themes/stable/templates/views/views-view.html.twig b/core/themes/stable/templates/views/views-view.html.twig
index 9209b83..2be7d15 100644
--- a/core/themes/stable/templates/views/views-view.html.twig
+++ b/core/themes/stable/templates/views/views-view.html.twig
@@ -49,9 +49,9 @@
   {{ exposed }}
   {{ attachment_before }}
 
-  {% if rows %}
+  {% if rows -%}
     {{ rows }}
-  {% elseif empty %}
+  {% elseif empty -%}
     {{ empty }}
   {% endif %}
   {{ pager }}