diff --git a/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp
index 33893be9da..c7a1079c47 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp
@@ -21,6 +21,6 @@ TEST(BuiltInAccelerometerTest, Accelerometer) {
 	Wait(1.0);
 
 	ASSERT_NEAR(0.0, accelerometer.GetX(), kAccelerationTolerance);
-	ASSERT_NEAR(0.0, accelerometer.GetY(), kAccelerationTolerance);
-	ASSERT_NEAR(1.0, accelerometer.GetZ(), kAccelerationTolerance);
+	ASSERT_NEAR(1.0, accelerometer.GetY(), kAccelerationTolerance);
+	ASSERT_NEAR(0.0, accelerometer.GetZ(), kAccelerationTolerance);
 }
diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java
index 075ed9fa08..4f23b25ff4 100644
--- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java
+++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/BuiltInAccelerometerTest.java
@@ -64,8 +64,8 @@ public class BuiltInAccelerometerTest extends AbstractComsSetup {
 	@Test
 	public void testAccelerometer() {
 		assertEquals(0.0, m_accelerometer.getX(), kAccelerationTolerance);
-		assertEquals(0.0, m_accelerometer.getY(), kAccelerationTolerance);
-		assertEquals(1.0, m_accelerometer.getZ(), kAccelerationTolerance);
+		assertEquals(1.0, m_accelerometer.getY(), kAccelerationTolerance);
+		assertEquals(0.0, m_accelerometer.getZ(), kAccelerationTolerance);
 	}
 
 }