diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index c082a56..4a7e2c3 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -1351,6 +1351,12 @@ public function randomStringValidate($string) {
       return FALSE;
     }
 
+    // Ensure the fields do not begin with an @ sign as this causes CURL to fail
+    // if used in conjunction with a file upload.
+    if (preg_match('/^@/', $string)) {
+      return FALSE;
+    }
+
     return TRUE;
   }
 
diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/TestBaseTest.php b/core/modules/simpletest/tests/Drupal/simpletest/Tests/TestBaseTest.php
index d645149..3988603 100644
--- a/core/modules/simpletest/tests/Drupal/simpletest/Tests/TestBaseTest.php
+++ b/core/modules/simpletest/tests/Drupal/simpletest/Tests/TestBaseTest.php
@@ -48,6 +48,8 @@ public function randomStringValidateProvider () {
       array('curry   paste', FALSE),
       array('curry paste', TRUE),
       array('thai green curry paste', TRUE),
+      array('@startswithat', FALSE),
+      array('contains@at', TRUE),
     );
   }
 
