diff --git a/tests/src/dot11/assoc_request.cpp b/tests/src/dot11/assoc_request.cpp
index 7272609..0ab0fa2 100644
--- a/tests/src/dot11/assoc_request.cpp
+++ b/tests/src/dot11/assoc_request.cpp
@@ -77,9 +77,9 @@ TEST_F(Dot11AssocRequestTest, ClonePDU) {
 
 TEST_F(Dot11AssocRequestTest, FromBytes) {
     Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
-    ASSERT_TRUE(dot11.get());
+    ASSERT_TRUE(dot11.get() != NULL);
     const Dot11AssocRequest *inner = dot11->find_pdu<Dot11AssocRequest>();
-    ASSERT_TRUE(inner);
+    ASSERT_TRUE(inner != NULL);
     test_equals_expected(*inner);
 }
 
diff --git a/tests/src/dot11/beacon.cpp b/tests/src/dot11/beacon.cpp
index 20bc4f9..5c66123 100644
--- a/tests/src/dot11/beacon.cpp
+++ b/tests/src/dot11/beacon.cpp
@@ -33,23 +33,23 @@ void test_equals_expected(const Dot11Beacon &dot11) {
     EXPECT_EQ(dot11.interval(), 0x14fa);
     
     const Dot11Beacon::capability_information &info = dot11.capabilities();
-    EXPECT_EQ(info.ess(), 1);
-    EXPECT_EQ(info.ibss(), 0);
-    EXPECT_EQ(info.cf_poll(), 1);
-    EXPECT_EQ(info.cf_poll_req(), 0);
-    EXPECT_EQ(info.privacy(), 1);
-    EXPECT_EQ(info.short_preamble(), 0);
-    EXPECT_EQ(info.pbcc(), 0);
-    EXPECT_EQ(info.channel_agility(), 1);
-    EXPECT_EQ(info.spectrum_mgmt(), 0);
-    EXPECT_EQ(info.qos(), 0);
-    EXPECT_EQ(info.sst(), 0);
-    EXPECT_EQ(info.apsd(), 0);
-    EXPECT_EQ(info.radio_measurement(), 0);
-    EXPECT_EQ(info.dsss_ofdm(), 1);
-    EXPECT_EQ(info.delayed_block_ack(), 0);
-    EXPECT_EQ(info.immediate_block_ack(), 0);
-    
+    EXPECT_EQ(info.ess(), true);
+    EXPECT_EQ(info.ibss(), false);
+    EXPECT_EQ(info.cf_poll(), true);
+    EXPECT_EQ(info.cf_poll_req(), false);
+    EXPECT_EQ(info.privacy(), true);
+    EXPECT_EQ(info.short_preamble(), false);
+    EXPECT_EQ(info.pbcc(), false);
+    EXPECT_EQ(info.channel_agility(), true);
+    EXPECT_EQ(info.spectrum_mgmt(), false);
+    EXPECT_EQ(info.qos(), false);
+    EXPECT_EQ(info.sst(), false);
+    EXPECT_EQ(info.apsd(), false);
+    EXPECT_EQ(info.radio_measurement(), false);
+    EXPECT_EQ(info.dsss_ofdm(), true);
+    EXPECT_EQ(info.delayed_block_ack(), false);
+    EXPECT_EQ(info.immediate_block_ack(), false);
+
     ::test_equals_expected(static_cast<const Dot11ManagementFrame&>(dot11));
 }
 
@@ -110,9 +110,9 @@ TEST_F(Dot11BeaconTest, SeqNum) {
 
 TEST_F(Dot11BeaconTest, FromBytes) {
     Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
-    ASSERT_TRUE(dot11.get());
+    ASSERT_TRUE(dot11.get() != NULL);
     const Dot11Beacon *beacon = dot11->find_pdu<Dot11Beacon>();
-    ASSERT_TRUE(beacon);
+    ASSERT_TRUE(beacon != NULL);
     test_equals_expected(*beacon);
 }
 
diff --git a/tests/src/ethernetII.cpp b/tests/src/ethernetII.cpp
index f85f839..c67d367 100644
--- a/tests/src/ethernetII.cpp
+++ b/tests/src/ethernetII.cpp
@@ -154,7 +154,7 @@ TEST_F(EthernetIITest, ConstructorFromIPv6Buffer) {
 TEST_F(EthernetIITest, EliminateEthernetPadding) {
     EthernetII eth(smallip_packet, sizeof(smallip_packet));
     ASSERT_TRUE(eth.inner_pdu() != NULL);
-    ASSERT_TRUE(eth.find_pdu<IP>());
-    ASSERT_TRUE(eth.find_pdu<TCP>());
-    ASSERT_FALSE(eth.find_pdu<RawPDU>());
+    ASSERT_TRUE(eth.find_pdu<IP>() != NULL);
+    ASSERT_TRUE(eth.find_pdu<TCP>() != NULL);
+    ASSERT_FALSE(eth.find_pdu<RawPDU>() != NULL);
 }
diff --git a/tests/src/wep_decrypt.cpp b/tests/src/wep_decrypt.cpp
index 52213bb..1649f69 100644
--- a/tests/src/wep_decrypt.cpp
+++ b/tests/src/wep_decrypt.cpp
@@ -36,7 +36,7 @@ TEST_F(WEPDecryptTest, Decrypt1) {
     ASSERT_TRUE(decrypter.decrypt(dot11));
     
     ARP *arp = dot11.find_pdu<ARP>();
-    ASSERT_TRUE(arp);
+    ASSERT_TRUE(arp != NULL);
     EXPECT_EQ(arp->sender_hw_addr(), "00:0e:a6:6b:fb:69");
     EXPECT_EQ(arp->target_hw_addr(), "00:00:00:00:00:00");
     EXPECT_EQ(arp->sender_ip_addr(), "172.16.0.1");