diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index c082a56..d35a2b4 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -1342,7 +1342,9 @@ public function randomStringValidate($string) {
     }
 
     // Starting with a space means that length might not be what is expected.
-    if (preg_match('/^\s/', $string)) {
+    // Starting with an @ sign causes CURL to fail if used in conjunction with a
+    // file upload, see https://drupal.org/node/2174997.
+    if (preg_match('/^(\s|@)/', $string)) {
       return FALSE;
     }
 
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),
     );
   }
 
