diff --git a/include/etl/expected.h b/include/etl/expected.h
index 90a94cb9d..168155af9 100644
--- a/include/etl/expected.h
+++ b/include/etl/expected.h
@@ -605,6 +605,17 @@ namespace etl
       return etl::move(etl::get<Error_Type>(storage));
     }
 
+
+    //*******************************************
+    /// Swap with another etl::expected.
+    //*******************************************
+    void swap(this_type& other)
+    {
+      using ETL_OR_STD::swap;
+
+      swap(storage, other.storage);
+    }
+
     //*******************************************
     ///
     //*******************************************
@@ -925,6 +936,16 @@ namespace etl
     }
 #endif
 
+    //*******************************************
+    /// Swap with another etl::expected.
+    //*******************************************
+    void swap(this_type& other)
+    {
+      using ETL_OR_STD::swap;
+
+      swap(storage, other.storage);
+    }
+
   private:
 
     enum
@@ -1063,6 +1084,24 @@ bool operator !=(const etl::unexpected<TError>& lhs, const etl::unexpected<TErro
   return !(lhs == rhs);
 }
 
+//*******************************************
+/// Swap etl::expected.
+//*******************************************
+template <typename TValue, typename TError>
+ETL_CONSTEXPR14
+void swap(etl::expected<TValue, TError>& lhs, etl::expected<TValue, TError>& rhs)
+{
+  lhs.swap(rhs);
+}
+
+//*******************************************
+template <typename TError>
+ETL_CONSTEXPR14
+void swap(etl::expected<void, TError>& lhs, etl::expected<void, TError>& rhs)
+{
+  lhs.swap(rhs);
+}
+
 //*******************************************
 /// Swap etl::unexpected.
 //*******************************************
diff --git a/test/test_expected.cpp b/test/test_expected.cpp
index cc3aabbd6..11f2d8b3d 100644
--- a/test/test_expected.cpp
+++ b/test/test_expected.cpp
@@ -696,5 +696,68 @@ namespace
       CHECK_FALSE(test_unexp == test_unexp_unequal);
       CHECK_TRUE(test_unexp != test_unexp_unequal);
     }
+
+    //*************************************************************************
+    TEST(test_expected_swap)
+    {
+      etl::expected<int, int> test_exp_1 = 1;
+      etl::expected<int, int> test_exp_2 = 2;
+      etl::expected<int, int> test_unexp_1 = etl::unexpected<int>(1);
+      etl::expected<int, int> test_unexp_2 = etl::unexpected<int>(2);
+
+      etl::expected<int, int> test_exp_1_swap = test_exp_1;
+      etl::expected<int, int> test_exp_2_swap = test_exp_2;
+
+      swap(test_exp_1_swap, test_exp_2_swap);
+
+      CHECK_TRUE(test_exp_1_swap == test_exp_2);
+      CHECK_TRUE(test_exp_2_swap == test_exp_1);
+
+      etl::expected<int, int> test_unexp_1_swap = test_unexp_1;
+      etl::expected<int, int> test_unexp_2_swap = test_unexp_2;
+
+      swap(test_unexp_1_swap, test_unexp_2_swap);
+
+      CHECK_TRUE(test_unexp_1_swap == test_unexp_2);
+      CHECK_TRUE(test_unexp_2_swap == test_unexp_1);
+
+      etl::expected<int, int> test_exp_swap = test_exp_1;
+      etl::expected<int, int> test_unexp_swap = test_unexp_1;
+
+      swap(test_exp_swap, test_unexp_swap);
+
+      CHECK_TRUE(test_exp_swap == test_unexp_1);
+      CHECK_TRUE(test_unexp_swap == test_exp_1);
+    }
+
+    //*************************************************************************
+    TEST(test_expected_void_swap)
+    {
+      etl::expected<void, int> test_exp;
+      etl::expected<void, int> test_unexp = etl::unexpected<int>(1);
+
+      etl::expected<void, int> test_exp_swap = test_exp;
+      etl::expected<void, int> test_unexp_swap = test_unexp;
+
+      swap(test_exp_swap, test_unexp_swap);
+
+      CHECK_TRUE(test_exp_swap == test_unexp);
+      CHECK_TRUE(test_unexp_swap == test_exp);
+    }
+
+    //*************************************************************************
+    TEST(test_unexpected_swap)
+    {
+      etl::unexpected<int> test_unexp_1 = etl::unexpected<int>(1);
+      etl::unexpected<int> test_unexp_2 = etl::unexpected<int>(2);
+
+      etl::unexpected<int> test_unexp_1_swap = test_unexp_1;
+      etl::unexpected<int> test_unexp_2_swap = test_unexp_2;
+
+      swap(test_unexp_1_swap, test_unexp_2_swap);
+
+      CHECK_TRUE(test_unexp_1_swap == test_unexp_2);
+      CHECK_TRUE(test_unexp_2_swap == test_unexp_1);
+    }
   };
 }