diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 23a4415fb9..089b23963d 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -910,9 +910,6 @@ void BN_consttime_swap(BN_ULONG condition, BIGNUM *a, BIGNUM *b, int nwords)
     BN_ULONG t;
     int i;
 
-    if (a == b)
-        return;
-
     bn_wcheck_size(a, nwords);
     bn_wcheck_size(b, nwords);
 
diff --git a/test/bntest.c b/test/bntest.c
index 9f4bc0b3eb..85445b701b 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -171,6 +171,11 @@ static int test_swap(void)
             || !equalBN("swap", b, c))
         goto err;
 
+    /* regular swap: same pointer */
+    BN_swap(a, a);
+    if (!equalBN("swap with same pointer", a, d))
+        goto err;
+
     /* conditional swap: true */
     cond = 1;
     BN_consttime_swap(cond, a, b, top);
@@ -178,6 +183,11 @@ static int test_swap(void)
             || !equalBN("cswap true", b, d))
         goto err;
 
+    /* conditional swap: true, same pointer */
+    BN_consttime_swap(cond, a, a, top);
+    if (!equalBN("cswap true", a, c))
+        goto err;
+
     /* conditional swap: false */
     cond = 0;
     BN_consttime_swap(cond, a, b, top);
@@ -185,6 +195,11 @@ static int test_swap(void)
             || !equalBN("cswap false", b, d))
         goto err;
 
+    /* conditional swap: false, same pointer */
+    BN_consttime_swap(cond, a, a, top);
+    if (!equalBN("cswap false", a, c))
+        goto err;
+
     /* same tests but checking flag swap */
     BN_set_flags(a, BN_FLG_CONSTTIME);