diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 2c94e2e76914f..eb0b4afec8c2f 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -574,7 +574,7 @@ public function uploadFile($targetPath, $type = null)
         }
 
         // create thumbnail
-        $this->resizeFile($targetPath . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);
+        $this->resizeFile(rtrim($targetPath, '/') . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);
 
         return $result;
     }
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
index 9dca51065124f..a18a4f01f17ba 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
@@ -46,10 +46,10 @@
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
-            <argument name="image" value="ImageUpload_1"/>
+            <argument name="image" value="ImageUpload1"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
-            <argument name="image" value="ImageUpload1"/>
+            <argument name="image" value="ImageUpload3"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameAToZ">
@@ -57,8 +57,8 @@
         </actionGroup>
         <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameAToZ">
             <argument name="firstImageFile" value="{{ImageUpload.file}}"/>
-            <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
-            <argument name="thirdImageFile" value="{{ImageUpload1.value}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload1.value}}"/>
+            <argument name="thirdImageFile" value="{{ImageUpload3.value}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
index 71d2020d08658..348514f45b26a 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
@@ -46,18 +46,18 @@
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
-            <argument name="image" value="ImageUpload_1"/>
+            <argument name="image" value="ImageUpload1"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
-            <argument name="image" value="ImageUpload1"/>
+            <argument name="image" value="ImageUpload3"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameZToA">
             <argument name="sortName" value="name_za"/>
         </actionGroup>
         <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameZToA">
-            <argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
-            <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
+            <argument name="firstImageFile" value="{{ImageUpload3.value}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload1.value}}"/>
             <argument name="thirdImageFile" value="{{ImageUpload.file}}"/>
         </actionGroup>
     </test>